commit f755f9b9e67232d9d39682cbcdf4433ac738e17a Merge: 9f650b24e f46cdb3ff Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 5 14:41:53 2017 -0500

Merge branch 'maint-0.3.2'

changes/bug21394 | 9 +++++++++ scripts/maint/lintChanges.py | 4 ++-- src/or/dns.c | 23 ++++++++++++++++++++--- 3 files changed, 31 insertions(+), 5 deletions(-)