commit 875a551409c81fced826336a73cafa36396a43f8 Merge: 19febed a25c0a5 Author: Nick Mathewson <[email protected]> Date: Tue Jun 14 13:46:46 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug3369 | 4 ++++
changes/bug3393 | 5 +++++
src/or/dnsserv.c | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
