commit 2aa1767b25e6b2b04892696c4c00e0257feb3812 Merge: 707076002 a8e8ce860 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 2 14:42:27 2018 -0500 Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2 src/config/torrc.minimal.in-staging | 6 +++++- src/config/torrc.sample.in | 13 +++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-)