commit 73de7b4bcb9b85a02f0bb7e75620dc6bffbdc75e
Merge: 3b5188576 06484eb5e
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Jan 4 15:04:54 2019 -0500
Merge branch 'bug21394_029_redux' into maint-0.2.9
changes/bug21394.2 | 7 +++++++
src/or/dns.c | 19 +++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)