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

[nickm at torproject.org]

commit 99b4f868332b3ae304e669240657994022d69991
Merge: fd46d8d0a 2aa1767b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 2 14:42:31 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 src/config/torrc.minimal.in-staging |  6 +++++-
 src/config/torrc.sample.in          | 13 +++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)