commit b355ddb20f534d772dcb42737ceb1d0264e2c3f1 Merge: 4cac5df 78dec94 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 18 10:14:14 2012 -0400 Merge branch 'smartlist_shorten' into maint-0.2.3 changes/smartlist_foreach | 8 +++++ src/common/container.h | 24 ++++++++++------ src/common/log.c | 5 +-- src/or/circuitbuild.c | 14 ++++----- src/or/config.c | 8 ++-- src/or/connection.c | 15 ++++------ src/or/connection_edge.c | 5 +-- src/or/control.c | 24 ++++++--------- src/or/cpuworker.c | 5 +-- src/or/directory.c | 24 ++++++--------- src/or/dirserv.c | 28 ++++++++---------- src/or/dirvote.c | 69 ++++++++++++++++++++------------------------ src/or/geoip.c | 4 +- src/or/main.c | 5 +-- src/or/networkstatus.c | 32 ++++++++++----------- src/or/policies.c | 14 ++++----- src/or/rendservice.c | 8 ++-- src/or/routerlist.c | 53 +++++++++++++++------------------- src/or/routerparse.c | 4 +- src/test/test.c | 5 +-- src/test/test_util.c | 5 +-- 21 files changed, 166 insertions(+), 193 deletions(-)