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

[nickm at torproject.org]

commit e403f880630d10ca1d154a05f6721b07d98354e2
Merge: 32ed15328 73de7b4bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 4 15:04:58 2019 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug21394.2 |  7 +++++++
 src/or/dns.c       | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)