[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/170'

[dgoulet at torproject.org]

commit bb249a221f35fe3cef53df4c36c84c2d5e63b66d
Merge: f02f8f8946 a251cff0c3
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Oct 14 09:46:44 2020 -0400

    Merge branch 'tor-gitlab/mr/170'

 changes/ticket40139                                |  7 ++++++
 doc/man/tor.1.txt                                  |  9 --------
 src/app/config/config.c                            |  2 +-
 src/app/config/or_options_st.h                     |  4 ----
 src/core/or/circuitbuild.c                         | 20 ++++-------------
 src/core/or/circuituse.c                           | 25 ++++------------------
 src/test/conf_examples/large_1/expected            |  1 -
 src/test/conf_examples/large_1/expected_no_dirauth |  1 -
 8 files changed, 16 insertions(+), 53 deletions(-)