commit e69afb853dde958c6efd94dfdb0cd18f01f7d841 Merge: 92c3926 0151e1d Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 18 09:02:48 2017 -0500

Merge branch 'bug19769_19025_029'

changes/bug19025 | 4 ++++ changes/ticket19769 | 7 +++++++ src/or/dns.c | 33 ++++++++++++--------------------- src/or/dns.h | 14 ++++++++++++-- src/or/or.h | 12 ------------ src/test/test_cell_formats.c | 6 +++--- src/test/test_dns.c | 28 ++++------------------------ 7 files changed, 42 insertions(+), 62 deletions(-)