commit ec8ee541296f3ca494421cd8c8f9903e848823ec Merge: 7ccb1c5a8 06484eb5e Author: Nick Mathewson <ni...@torproject.org> Date: Wed Apr 4 08:55:37 2018 -0400
Merge branch 'bug21394_029_redux' into maint-0.3.3
changes/bug21394.2 | 7 +++++++
src/or/dns.c | 19 +++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
