[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1203'

[nickm at torproject.org]

commit f557680aa9582ac56dd8a8e25fce55503c7837c8
Merge: 88f9b123d 57c34e80d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 6 13:12:42 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1203'

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