commit c8f3af4cecaf4884a8c0b77374f0c19998ec9f2b Merge: c9a3525c7 072e194a1 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 11:48:12 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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