commit 6c5a73f87abc6a8791e41e9d7f3728d67145001c Merge: 21ee765df cbc465a3d Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 09:18:52 2017 -0500

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

changes/bug24362 | 2 ++ configure.ac | 14 ++++++++ doc/tor.1.txt | 5 +++ src/common/log.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++--- src/common/torlog.h | 6 +++- src/or/config.c | 34 ++++++++++++++++---- src/or/or.h | 1 + 7 files changed, 141 insertions(+), 13 deletions(-)