[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

[nickm at torproject.org]

commit 2ce43302490ac916be4188bff70f70958aee1790
Merge: c056d19 0ca3f49
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 10:37:43 2017 -0500

    Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5

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