commit 9f35dd9e8a586d2a490a0d295a47bbbfe18c3ca2 Merge: 6f1fe29e8 2bd23cebf Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 3 07:57:30 2018 -0500

Merge branch 'master' of git-rw.torproject.org:/tor

doc/tor.1.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)