Merge remote-tracking branch 'asn-github/adaptive_padding-final'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/app/config/config.c
Simple merge

diff --cc src/core/or/circuituse.c
Simple merge

diff --cc src/core/or/connection_edge.c
Simple merge

diff --cc src/feature/nodelist/networkstatus.c
Simple merge

diff --cc src/lib/time/compat_time.h
Simple merge

diff --cc src/test/test_util.c
Simple merge