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