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

[nickm at torproject.org]

commit 2f6a66a17402029b58f7a29af7c0eae56f5ea390
Merge: 72d9e05 2ce4330
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 10:39:50 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

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