commit 6e467a7a340cdc0267206ebaf8dca54c1a4a7b0a Merge: ef16a11b9 550037f67 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 10 15:27:09 2018 -0400

Merge remote-tracking branch 'isis-github/bug25409'

changes/bug25409 | 12 ++ changes/ticket25409 | 6 + doc/tor.1.txt | 19 +-- src/common/util.c | 348 ----------------------------------------- src/common/util.h | 9 +- src/or/config.c | 13 +- src/or/main.c | 29 ---- src/or/or.h | 4 - src/test/test_options.c | 32 ---- src/tools/tor-fw-helper/README | 10 -- 10 files changed, 24 insertions(+), 458 deletions(-)