commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 10:37:53 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

changes/bug16248 | 8 ++++++++ changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 66 insertions(+), 7 deletions(-)