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

[nickm at torproject.org]

commit 1f498220bda87e44d8a3ab12825270fde6eec7dc
Merge: 48f734178 42e31b5c4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 6 13:28:10 2020 -0500

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

 changes/ticket32807            | 4 ++++
 doc/tor.1.txt                  | 6 ------
 src/app/config/config.c        | 9 +--------
 src/app/config/or_options_st.h | 5 -----
 src/app/config/testnet.inc     | 1 -
 src/test/test_options.c        | 7 -------
 6 files changed, 5 insertions(+), 27 deletions(-)