commit 1457364c497d5a455d41d95118caad342d63bb8f Merge: f0fa0d2 6364952 Author: Nick Mathewson <[email protected]> Date: Tue Apr 7 14:05:52 2015 -0400
Merge branch 'doc15550_squashed'
changes/doc15550 | 4 ++++
doc/tor.1.txt | 42 ++++++++++++++++++++++++++++++++++--------
2 files changed, 38 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
