commit f2f720a7efe386cba06973a5927d2d4bc8bc9d60 Merge: 286e95f c2c6d12 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 14 10:20:16 2012 -0400
Merge branch 'split_routerlist.c_rebased'
src/or/circuitbuild.c | 1 + src/or/circuitlist.c | 1 + src/or/config.c | 2 + src/or/confparse.c | 2 +- src/or/connection_edge.c | 1 + src/or/control.c | 16 +- src/or/directory.c | 1 + src/or/include.am | 2 + src/or/networkstatus.c | 24 + src/or/networkstatus.h | 2 + src/or/nodelist.c | 500 ++++++++++++++++++++++ src/or/nodelist.h | 13 +- src/or/rendclient.c | 1 + src/or/rendservice.c | 1 + src/or/router.c | 1 + src/or/routerlist.c | 1057 +--------------------------------------------- src/or/routerlist.h | 49 +-- src/or/routerset.c | 426 +++++++++++++++++++ src/or/routerset.h | 48 +++ 19 files changed, 1040 insertions(+), 1108 deletions(-)