commit 80360ed9fa86c22ee3f9cf7e14076ef64466918a Merge: 90046a0 96fab4a Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 23 09:28:27 2017 -0400

Merge branch 'bug3056_squashed'

changes/bug3056 | 3 +++ src/or/dns.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)