commit 5ee93047cbf711398ba7425b86d961e688cfaa53 Merge: 504dc5a93 f0f2fab5e Author: Nick Mathewson <ni...@torproject.org> Date: Tue Mar 13 11:03:08 2018 -0400
Merge branch 'maint-0.3.3' into release-0.3.3
changes/ticket23635 | 3 +++
doc/tor.1.txt | 19 ++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
