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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2'

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