commit 7a74b3663fdaa40fc84e48990d15953a8f46a2bf Merge: b1fc383bd 162d75d58 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 25 13:57:37 2018 -0500

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

changes/bug25026 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)