commit 7ca0a9c4aec374f5fbddc7847c543c5ba9e44869 Merge: c99ec36de d4f410860 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 11:16:17 2017 -0500

Merge remote-tracking branch 'ahf-oniongit/bugs/24605'

changes/bug24605 | 4 +++ doc/tor.1.txt | 5 ++++ src/or/config.c | 7 ++++- src/or/main.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/main.h | 5 ++++ src/or/or.h | 2 ++ src/or/status.c | 14 ++++++++++ 7 files changed, 118 insertions(+), 2 deletions(-)