commit 7a8cac14d52b6e107990cb251bd75b148ef35567 Merge: 6683331 6d0991e Author: Nick Mathewson <[email protected]> Date: Wed Apr 23 11:11:08 2014 -0400
Merge remote-tracking branch 'public/bug10268'
changes/bug10268 | 6 ++++++
src/or/dnsserv.c | 29 +++++++++++++++++++----------
2 files changed, 25 insertions(+), 10 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
