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

[nickm at torproject.org]

commit 26ea56a6c2deaadd3031e9efde928a28120c1647
Merge: 6cfbaed 4bce207
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 10:39:54 2017 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7

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