commit 60274296c3e012bb0ca5ad3214e2b8aa0fe19e82 Merge: b8e8910 92615f6 Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 15:13:07 2016 -0400

Merge branch 'doc18312' into maint-0.2.8

changes/bug18312 | 4 ++++ doc/tor.1.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)