commit 1089ac6f2275e5d6b62debb5dd05a936fdbad6a7 Merge: 80d2376f33 563f8610fd Author: David Goulet dgoulet@torproject.org Date: Tue Aug 18 08:56:27 2020 -0400
Merge branch 'tor-gitlab/mr/126'
changes/ticket40101 | 3 +++ doc/HACKING/CircuitPaddingDevelopment.md | 14 ++++++------- doc/HACKING/CircuitPaddingQuickStart.md | 36 ++++++++++++++++---------------- doc/HACKING/Fuzzing.md | 2 +- doc/HACKING/GettingStarted.md | 11 +++++----- doc/HACKING/ReleasingTor.md | 2 +- doc/TUNING | 15 +++++++------ doc/man/tor.1.txt | 8 +++---- src/app/config/app_config.md | 3 +-- src/app/config/config.c | 4 ++-- src/core/or/circuitbuild.c | 2 +- src/core/or/circuitlist.c | 2 +- src/feature/relay/relay_config.c | 2 +- src/feature/relay/router.c | 2 +- src/lib/string/compat_string.h | 2 +- src/test/test_options.c | 2 +- 16 files changed, 56 insertions(+), 54 deletions(-)