[tor-commits] [tor/master] Merge branch 'bug18710_025' into maint-0.2.8

[nickm at torproject.org]

commit 31332a878db0d8f8d53fe4e535ec9ae812675315
Merge: 8f292f1 0ca3f49
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 4 14:47:04 2016 -0400

    Merge branch 'bug18710_025' into maint-0.2.8

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