Merge branch 'bug11108'
commit4a2a1e572ec789efee2779e00d920a70892845cc
authorNick Mathewson <nickm@torproject.org>
Thu, 6 Mar 2014 15:22:40 +0000 (6 10:22 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 6 Mar 2014 15:22:40 +0000 (6 10:22 -0500)
tree184047825e2fbc3b5b46984e29a72145c05ecf2f
parentd3c5df6cf6f3d978d28e6f5d707af3541a183544
parent967d9c9f1029a5d9b993888bac91d3959bf4c991
Merge branch 'bug11108'
doc/tor.1.txt
src/or/policies.c