commit 2b33e8037e7ae5e947ce3186a06c90478de6c7e2 Merge: 1d554e4baf 268d01ada5 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 14 10:59:30 2020 -0400 Merge branch 'ticket40033_045_01_squashed' src/app/config/fallback_dirs.inc | 6 +++--- src/core/or/circuitbuild.c | 22 +++++++++++----------- src/core/or/connection_or.c | 2 +- src/feature/client/entrynodes.c | 4 ++-- src/feature/dirparse/ns_parse.c | 4 ++-- src/feature/hs/hs_service.c | 2 +- src/feature/nodelist/authcert.c | 2 +- src/feature/nodelist/authcert.h | 2 +- src/feature/nodelist/networkstatus.c | 4 ++-- src/lib/sandbox/sandbox.c | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-)