commit 74842cce63fee55389179c2dd45346f0c257a6ff Merge: 45a93ac80 c52d4d9e3 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 5 16:41:34 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-)