commit 286b129b09964bbff2bd8f5de7f4edac5f2b4827 Merge: c39c9ce26 c7cbe6446 Author: David Goulet dgoulet@torproject.org Date: Thu Sep 12 13:53:59 2019 -0400

Merge branch 'tor-github/pr/1319'

changes/ticket31626 | 4 ++++ src/app/config/config.c | 2 +- src/app/config/statefile.c | 2 +- src/core/include.am | 2 -- src/core/or/circuitbuild.c | 2 +- src/core/or/circuitstats.c | 2 +- src/feature/client/entrynodes.c | 2 +- src/feature/control/control_cmd.c | 2 +- src/feature/dirauth/shared_random.c | 2 +- src/feature/dirauth/shared_random_state.c | 2 +- src/feature/hs/hs_dos.c | 2 +- src/lib/confmgt/.may_include | 2 ++ src/{app/config => lib/confmgt}/confparse.c | 2 +- src/{app/config => lib/confmgt}/confparse.h | 0 src/lib/confmgt/include.am | 2 ++ src/test/test_btrack.c | 2 +- src/test/test_config.c | 2 +- src/test/test_confmgr.c | 2 +- src/test/test_confparse.c | 2 +- src/test/test_dir.c | 2 +- src/test/test_entryconn.c | 2 +- src/test/test_entrynodes.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_options.c | 2 +- src/test/test_pt.c | 2 +- 25 files changed, 28 insertions(+), 22 deletions(-)