commit 48d94e290dec5a5563d8ba97754b98f4374e9566 Merge: c1d98c75e 16fd975a8 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 5 16:41:34 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-)