commit 1a7794e4750163a0ddc6e26a0a6fe12f799f9cb0 Merge: 85ef58e 5e96729 Author: Nick Mathewson <[email protected]> Date: Tue Mar 25 10:02:22 2014 -0400
Merge remote-tracking branch 'public/bug11061_024'
changes/bug11061 | 3 +++
doc/tor.1.txt | 22 ++++++++++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
