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

[nickm at torproject.org]

commit ad54a025d6cfbb74c7b1263c58d7729fe182d6ec
Merge: 919106989 58e1c6dd8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 11:30:33 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 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(-)