[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 97046436b20dbba1258267e0a7bd0c5b02e125d4
Merge: c018aa819 b8dedaee7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:59:12 2017 -0400

    Merge branch 'maint-0.3.2'

 changes/longclaw_23592 | 3 +++
 src/or/config.c        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)