commit 4bce2072acaca38d40086c943d8f332ed2c2cf50 Merge: 86d5a6f f2a3041 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 10:39:03 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-)