[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 766d0a2d98591ed840cce42710c5a59a2e7dc731
Merge: b1c4ab0be 072e194a1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 11:48:12 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug21394 |  9 +++++++++
 src/or/dns.c     | 23 ++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)