commit 882fb8383da941ec8bec7a698caacd5924f25892 Merge: 9de456a 270dcc9 Author: Nick Mathewson <[email protected]> Date: Wed Oct 9 09:45:21 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/9854 | 3 +++
doc/tor.1.txt | 10 +++++++---
src/config/torrc.sample.in | 9 ++++++---
3 files changed, 16 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
