commit 0a0f93d277046a524740ad110060abf8ed137b8f
Merge: 5a5147d ff6bb13
Author: Nick Mathewson <[email protected]>
Date: Wed Jul 31 21:48:48 2013 -0400
Merge remote-tracking branch 'arma/bug9354' into maint-0.2.4
changes/bug9354 | 5 +++++
doc/tor.1.txt | 6 ++++--
src/or/config.c | 2 +-
src/or/entrynodes.c | 17 +++++++++++++----
src/or/or.h | 3 ++-
5 files changed, 25 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
