commit d4a2decc56cc5328c8edfde2cc512efd844cc32b Merge: 236cf49 fd8284c Author: Nick Mathewson <[email protected]> Date: Tue Apr 25 12:43:41 2017 -0400
Merge branch 'bug21715_031_01_squashed'
changes/bug21715 | 5 +++++
doc/tor.1.txt | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
