Merge branch 'split_routerlist.c_rebased'

src/or/circuitbuild.c

src/or/circuitlist.c

src/or/config.c

src/or/confparse.c

src/or/connection_edge.c

src/or/control.c

src/or/directory.c

src/or/include.am

src/or/networkstatus.c

src/or/networkstatus.h

src/or/nodelist.c

src/or/nodelist.h

src/or/rendclient.c

src/or/rendservice.c

src/or/router.c

src/or/routerlist.c

src/or/routerlist.h

src/or/routerset.c

src/or/routerset.h