commit 144bd86570ee2afc4efd8ecd7c59a65973452064 Merge: b08ddb6 42a74f7 Author: Nick Mathewson <[email protected]> Date: Mon Sep 19 14:21:12 2016 -0400
Merge remote-tracking branch 'teor/bug20117'
changes/bug20117 | 6 ++++++
doc/tor.1.txt | 5 +++--
2 files changed, 9 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
