commit 8b62a738b3add64dcd26a82dff44a7e9e11ff5a9 Merge: e4821fa ca18768 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 16 17:02:46 2013 -0500

Merge branch 'bug5285_v2'

changes/rename5285 | 2 + src/common/compat.c | 2 +- src/common/container.c | 22 +++++++------- src/common/container.h | 12 ++++---- src/or/circuitbuild.c | 2 +- src/or/circuitlist.c | 4 +- src/or/circuituse.c | 5 ++- src/or/connection_edge.c | 5 ++- src/or/dirvote.c | 2 +- src/or/dns.c | 9 +++-- src/or/entrynodes.c | 4 +- src/or/main.c | 10 +++--- src/or/networkstatus.c | 2 +- src/or/policies.c | 2 +- src/or/rendservice.c | 9 +++-- src/or/router.c | 4 +- src/or/routerlist.c | 10 +++--- src/or/transports.c | 4 +- src/test/bench.c | 8 ++-- src/test/test_containers.c | 68 ++++++++++++++++++++++---------------------- src/test/test_util.c | 12 ++++---- 21 files changed, 102 insertions(+), 96 deletions(-)