[tor-commits] [tor/master] Merge branch 'bug2616'

[nickm at torproject.org]

commit 42ff326afa2148f321ea7dce30e3008ff509ab35
Merge: e97eb6f e158f8d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 11 16:22:12 2011 -0400

    Merge branch 'bug2616'

 src/or/circuitbuild.c |   14 +++++---------
 src/or/nodelist.h     |    2 +-
 src/or/routerlist.c   |   35 ++++++++++++++++++++++-------------
 src/or/routerlist.h   |    1 -
 4 files changed, 28 insertions(+), 24 deletions(-)