[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

[nickm at torproject.org]

commit 0c18b2dc769413dd6a2293fd598cd405dc8a6e82
Merge: f9be4b9 f2a3041
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 10:39:52 2017 -0500

    Merge branch 'maint-0.2.6' into release-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(-)