commit 5f08eb6e57841916b04c05ac55e0900785b1f3a7 Merge: f395f4186 b74a1c77a Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 19 13:03:20 2017 -0400

Merge branch 'ticket18736'

changes/18736 | 3 +++ doc/tor.1.txt | 5 +++++ 2 files changed, 8 insertions(+)