Merge branch 'maint-0.2.9' into maint-0.3.0
commit766d0a2d98591ed840cce42710c5a59a2e7dc731
authorNick Mathewson <nickm@torproject.org>
Thu, 30 Nov 2017 16:48:12 +0000 (30 11:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 30 Nov 2017 16:48:12 +0000 (30 11:48 -0500)
tree3addec468ff5c739124d2b88c8ddfa129eae85e3
parentb1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
parent072e194a15e9aa0e75c6723763a69476f4f31b93
Merge branch 'maint-0.2.9' into maint-0.3.0
src/or/dns.c