commit 2bd40a8eb0be195022558addb868edf56162f9dc Merge: 79bb44c 5579bc0 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 16 15:07:58 2012 -0500
Merge branch 'bug4889_v2'
changes/clean_asprintf | 5 ++ src/common/compat.c | 16 +----- src/common/util.c | 23 +++----- src/common/util.h | 4 +- src/or/circuitbuild.c | 40 ++++---------- src/or/config.c | 58 +++++++-------------- src/or/connection_edge.c | 26 +++------ src/or/control.c | 131 ++++++++++++---------------------------------- src/or/directory.c | 62 +++++++--------------- src/or/dirserv.c | 4 +- src/or/dirvote.c | 80 +++++++--------------------- src/or/geoip.c | 10 +--- src/or/hibernate.c | 6 +-- src/or/networkstatus.c | 32 +++++------ src/or/ntmain.c | 20 ++----- src/or/policies.c | 10 +--- src/or/rephist.c | 71 ++++++++++--------------- src/or/router.c | 12 ++--- src/or/routerlist.c | 20 ++------ src/or/transports.c | 9 ++-- 20 files changed, 201 insertions(+), 438 deletions(-)