commit a812e8b6a875241839e2fd367c31b9e446977dff Merge: d1b40cf 26e789f Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 18 15:54:56 2012 -0500

Merge branch 'bug4893'

changes/renaming_identifiers | 9 ++ src/common/address.c | 6 +- src/common/aes.c | 2 +- src/common/aes.h | 2 +- src/common/compat.c | 4 +- src/common/container.c | 2 +- src/common/container.h | 2 +- src/common/crypto.c | 226 +++++++++++++++++++++--------------------- src/common/crypto.h | 134 +++++++++++++------------- src/common/log.c | 6 +- src/common/tortls.c | 70 +++++++------- src/common/tortls.h | 10 +- src/common/util.c | 12 +- src/or/circuitbuild.c | 76 +++++++------- src/or/circuitbuild.h | 4 +- src/or/circuitlist.c | 22 ++-- src/or/command.c | 12 +- src/or/config.c | 46 +++++----- src/or/connection.c | 14 ++-- src/or/connection_or.c | 28 +++--- src/or/connection_or.h | 4 +- src/or/control.c | 86 ++++++++-------- src/or/cpuworker.c | 6 +- src/or/directory.c | 56 +++++----- src/or/dirserv.c | 44 ++++---- src/or/dirserv.h | 4 +- src/or/dirvote.c | 82 ++++++++-------- src/or/dirvote.h | 10 +- src/or/dns.c | 6 +- src/or/geoip.c | 22 ++-- src/or/hibernate.c | 8 +- src/or/main.c | 10 +- src/or/microdesc.c | 8 +- src/or/networkstatus.c | 28 +++--- src/or/nodelist.c | 6 +- src/or/ntmain.c | 2 +- src/or/onion.c | 16 ++-- src/or/onion.h | 10 +- src/or/or.h | 44 ++++---- src/or/policies.c | 12 +- src/or/relay.c | 14 ++-- src/or/rendclient.c | 8 +- src/or/rendcommon.c | 44 ++++---- src/or/rendcommon.h | 4 +- src/or/rendmid.c | 6 +- src/or/rendservice.c | 66 ++++++------ src/or/rephist.c | 34 +++--- src/or/router.c | 96 +++++++++--------- src/or/router.h | 22 ++-- src/or/routerlist.c | 88 ++++++++-------- src/or/routerparse.c | 116 +++++++++++----------- src/or/routerparse.h | 2 +- src/or/transports.c | 24 +++--- src/test/bench.c | 32 +++--- src/test/test.c | 46 +++++----- src/test/test.h | 2 +- src/test/test_containers.c | 28 +++--- src/test/test_crypto.c | 80 ++++++++-------- src/test/test_dir.c | 64 ++++++------ src/test/test_microdesc.c | 2 +- src/test/test_pt.c | 4 +- src/test/test_util.c | 6 +- src/tools/tor-checkkey.c | 6 +- src/tools/tor-gencert.c | 14 ++-- 64 files changed, 984 insertions(+), 975 deletions(-)