commit 01037c106d3a00614646db0d45a07a925121a07f Merge: 753840a8a ec8ee5412 Author: Nick Mathewson <[email protected]> Date: Wed Apr 4 08:57:24 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/bug21394.2 | 7 +++++++
src/or/dns.c | 19 +++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
