commit 26639b7798b5f5dae93e40bd7d050cb218a8aad2 Merge: 173efa1 4409531 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 14:50:01 2013 -0400

Merge remote-tracking branch 'public/no_dup_guards' into 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(-)