commit 6bc1632b724da0593b0d781998bece33a0b6cec6 Merge: ed10b34ef f46cdb3ff Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 5 14:41:53 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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