commit da423532f7ac9d275d6b0cf62038a86b04d415ac Merge: 061682c 78c53ef Author: Nick Mathewson <[email protected]> Date: Tue Jan 20 13:46:56 2015 -0500
Merge branch 'ticket14254_squashed'
doc/tor.1.txt | 2 +-
src/or/config.c | 151 ++++++++++++++++---------------------------------------
2 files changed, 45 insertions(+), 108 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
