commit f15d9cf5db290f4e1c9ee80214674414238eabff
Merge: 1512747 26639b7
Author: Nick Mathewson <[email protected]>
Date: Mon Mar 18 14:50:36 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8231 | 5 +++++
src/or/circuitbuild.c | 1 +
src/or/entrynodes.c | 31 ++++++++++++++++++++++++++++++-
src/or/or.h | 7 +++++++
src/or/routerlist.c | 3 +++
5 files changed, 46 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
