commit ac3e389dbd7224a23dfa12da7a15b748feb88435 Merge: 8f798b686 ff38c0589 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 5 08:21:38 2018 -0400

Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3

changes/bug25582 | 3 +++ doc/tor.1.txt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)