commit ff93133403fa927eedc424dfb00557fcaab6aede Merge: ca8b90a84 6898131b4 Author: David Goulet dgoulet@torproject.org Date: Mon Jan 20 10:47:49 2020 -0500

Merge branch 'tor-github/pr/1675'

changes/ticket32637 | 6 ++++++ doc/tor.1.txt | 24 ++++++++++++++---------- src/app/config/config.c | 3 ++- src/core/mainloop/connection.c | 2 +- src/test/test_config.c | 2 ++ 5 files changed, 25 insertions(+), 12 deletions(-)