[tor-commits] [tor/master] Merge branch 'assume_reachable_revamp'
nickm at torproject.org
nickm at torproject.org
Fri Jun 26 12:35:05 UTC 2020
commit dbc2b75009a781f2664b871a6033d47b04946299
Merge: 40922629f cb25f5772
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Jun 26 08:34:56 2020 -0400
Merge branch 'assume_reachable_revamp'
changes/ticket33224 | 3 +++
changes/ticket34064 | 5 ++++
doc/tor.1.txt | 7 ++++-
src/app/config/config.c | 5 ++++
src/app/config/or_options_st.h | 9 ++++++-
src/core/or/channelpadding.c | 2 +-
src/core/or/channelpadding.h | 3 +--
src/core/or/circuitbuild.c | 2 +-
src/core/or/circuitstats.c | 4 +--
src/core/or/circuitstats.h | 2 +-
src/core/or/circuituse.c | 4 +--
src/feature/control/control_getinfo.c | 4 +--
src/feature/nodelist/networkstatus.c | 51 +++++++++++++++++++----------------
src/feature/nodelist/nodelist.c | 4 +--
src/feature/nodelist/nodelist.h | 4 +--
src/feature/relay/router.c | 43 +++++++++++++++++++++++++++--
src/feature/relay/router.h | 1 +
src/feature/relay/selftest.c | 14 ++++++----
src/feature/relay/selftest.h | 4 +--
src/feature/stats/predict_ports.c | 2 +-
20 files changed, 123 insertions(+), 50 deletions(-)
More information about the tor-commits
mailing list