commit 4a2a1e572ec789efee2779e00d920a70892845cc Merge: d3c5df6 967d9c9 Author: Nick Mathewson <[email protected]> Date: Thu Mar 6 10:22:40 2014 -0500
Merge branch 'bug11108'
changes/bug11108 | 8 ++++++++
doc/tor.1.txt | 13 ++++++++++---
src/or/policies.c | 22 +++++++++++++++-------
3 files changed, 33 insertions(+), 10 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
