commit 33f058a5ba6d57023b00db87c5c9480276bc7acc Merge: 47f4725 b75d1da Author: Nick Mathewson <[email protected]> Date: Tue Apr 26 13:12:43 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/dnsserv.c | 2 +-
src/or/eventdns.c | 4 ++--
src/or/eventdns.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
