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