commit 6db0c006b2d4d1244f9e4fa486ff7ad66a7ccb47 Merge: 0e4f7b56a b979415e8 Author: Roger Dingledine <arma@torproject.org> Date: Tue May 8 13:49:34 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26052 | 6 ++++++ doc/tor.1.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)