commit 5124bc251a2ee7d17a52cb00865467a36f4cea9d Merge: a88f3e2 ad8a27a Author: Nick Mathewson <[email protected]> Date: Mon Mar 18 15:39:21 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/dnsserv.c | 3 ++-
src/or/dnsserv.h | 3 ++-
src/or/entrynodes.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
