commit 410f1a438a4f163774e5912ba9ccc6503d178b35 Merge: 961c8f4 5924731 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 24 12:24:37 2016 -0400 Merge remote-tracking branch 'dgoulet/bug20435_030_01' changes/bug20435 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)