[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug1031'
nickm at torproject.org
nickm at torproject.org
Mon Oct 15 15:21:42 UTC 2012
commit 9f83142591dba5460f2cf09e49f716d5c7238f06
Merge: 469b847 30e2d41
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Oct 15 11:20:48 2012 -0400
Merge remote-tracking branch 'public/bug1031'
changes/bug1031 | 5 +
src/common/address.c | 24 +-
src/common/address.h | 6 +-
src/common/aes.c | 10 +-
src/common/aes.h | 4 +-
src/common/compat.c | 2 +-
src/common/compat.h | 8 +-
src/common/compat_libevent.h | 4 +-
src/common/container.c | 22 +-
src/common/container.h | 4 +-
src/common/crypto.c | 62 +++---
src/common/crypto.h | 12 +-
src/common/log.c | 82 +++---
src/common/memarea.c | 2 +-
src/common/memarea.h | 4 +-
src/common/mempool.c | 2 +-
src/common/mempool.h | 4 +-
src/common/torgzip.h | 4 +-
src/common/torint.h | 4 +-
src/common/torlog.h | 60 +++---
src/common/tortls.c | 36 ++--
src/common/tortls.h | 10 +-
src/common/util.c | 46 ++--
src/common/util.h | 44 ++--
src/ext/eventdns.h | 4 +-
src/ext/ht.h | 4 +-
src/or/buffers.h | 4 +-
src/or/channel.c | 2 +-
src/or/channel.h | 6 +-
src/or/channeltls.c | 100 ++++----
src/or/channeltls.h | 10 +-
src/or/circuitbuild.c | 110 ++++----
src/or/circuitbuild.h | 4 +-
src/or/circuitlist.c | 46 ++--
src/or/circuitlist.h | 10 +-
src/or/circuitmux.h | 10 +-
src/or/circuitmux_ewma.c | 10 +-
src/or/circuitmux_ewma.h | 10 +-
src/or/circuituse.c | 64 +++---
src/or/circuituse.h | 4 +-
src/or/command.c | 2 +-
src/or/command.h | 4 +-
src/or/config.c | 118 +++++-----
src/or/config.h | 4 +-
src/or/connection.c | 76 +++---
src/or/connection.h | 20 +-
src/or/connection_edge.c | 120 +++++-----
src/or/connection_edge.h | 8 +-
src/or/connection_or.c | 154 ++++++------
src/or/connection_or.h | 4 +-
src/or/control.c | 46 ++--
src/or/control.h | 4 +-
src/or/cpuworker.h | 4 +-
src/or/directory.c | 312 ++++++++++++------------
src/or/directory.h | 4 +-
src/or/dirserv.c | 16 +-
src/or/dirserv.h | 4 +-
src/or/dirvote.c | 30 ++--
src/or/dirvote.h | 4 +-
src/or/dns.c | 138 ++++++------
src/or/dns.h | 4 +-
src/or/dnsserv.c | 4 +-
src/or/dnsserv.h | 4 +-
src/or/eventdns_tor.h | 4 +
src/or/geoip.c | 42 ++--
src/or/geoip.h | 4 +-
src/or/hibernate.h | 4 +-
src/or/main.c | 2 +-
src/or/main.h | 4 +-
src/or/microdesc.c | 8 +-
src/or/microdesc.h | 4 +-
src/or/networkstatus.c | 12 +-
src/or/networkstatus.h | 4 +-
src/or/nodelist.c | 2 +-
src/or/nodelist.h | 4 +-
src/or/ntmain.h | 4 +-
src/or/onion.h | 4 +-
src/or/or.h | 118 +++++-----
src/or/policies.h | 4 +-
src/or/reasons.h | 4 +-
src/or/relay.c | 76 +++---
src/or/relay.h | 4 +-
src/or/rendclient.c | 34 ++--
src/or/rendclient.h | 4 +-
src/or/rendcommon.c | 8 +-
src/or/rendcommon.h | 4 +-
src/or/rendmid.c | 8 +-
src/or/rendmid.h | 4 +-
src/or/rendservice.c | 62 +++---
src/or/rendservice.h | 4 +-
src/or/rephist.c | 14 +-
src/or/rephist.h | 4 +-
src/or/replaycache.c | 2 +-
src/or/replaycache.h | 4 +-
src/or/router.c | 22 +-
src/or/router.h | 4 +-
src/or/routerlist.c | 38 ++--
src/or/routerlist.h | 4 +-
src/or/routerparse.c | 54 ++--
src/or/routerparse.h | 4 +-
src/or/statefile.c | 14 +-
src/or/status.c | 2 +-
src/or/status.h | 4 +-
src/or/transports.c | 4 +-
src/test/bench.c | 4 +-
src/test/test.c | 2 +-
src/test/test.h | 4 +-
src/test/test_addr.c | 6 +-
src/test/test_containers.c | 34 ++--
src/test/test_util.c | 112 +++++-----
src/tools/tor-checkkey.c | 2 +-
src/tools/tor-fw-helper/tor-fw-helper-natpmp.h | 4 +-
src/tools/tor-fw-helper/tor-fw-helper-upnp.h | 4 +-
src/tools/tor-fw-helper/tor-fw-helper.h | 4 +-
src/tools/tor-gencert.c | 6 +-
115 files changed, 1372 insertions(+), 1363 deletions(-)
More information about the tor-commits
mailing list