[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
arma at torproject.org
arma at torproject.org
Thu Apr 11 05:29:56 UTC 2013
commit 887eba98950f2974bd2031510e1ece2279a4f106
Merge: fcd9248 6acf0ac
Author: Roger Dingledine <arma at torproject.org>
Date: Thu Apr 11 01:29:24 2013 -0400
Merge branch 'maint-0.2.4' into release-0.2.4
changes/bug6174 | 6 +
changes/bug6206 | 6 +
changes/bug6304 | 4 +
changes/bug6572 | 4 +
changes/bug6673 | 4 +
changes/bug7065 | 5 +
changes/bug7164_diagnostic | 4 +
changes/bug7280 | 4 +
changes/bug7350 | 4 +
changes/bug7582 | 9 +
changes/bug7707_diagnostic | 5 +
changes/bug7768 | 3 +
changes/bug7799 | 7 +
changes/bug7947 | 4 +
changes/bug7950 | 4 +
changes/bug8002 | 5 +
changes/bug8014 | 5 +
changes/bug8031 | 7 +
changes/bug8059 | 6 +
changes/bug8062 | 5 +
changes/bug8180 | 7 +
changes/bug8203 | 4 +
changes/bug8231 | 5 +
changes/bug8235-diagnosing | 5 +
changes/bug8273 | 3 +
changes/bug8290 | 9 +
changes/bug8377 | 3 +
changes/bug8408 | 4 +
changes/bug8427 | 5 +
changes/bug8435 | 4 +
changes/bug8464 | 5 +
changes/bug8475 | 4 +
changes/bug8477-easypart | 3 +
changes/bug8596 | 3 +
changes/bug8598 | 6 +
changes/bug8599 | 4 +
changes/bug8638 | 3 +
changes/geoip-apr2013 | 3 +
changes/log-noise | 11 +
changes/ticket8240 | 4 +
changes/warn-unsigned-time_t | 5 +
configure.ac | 10 +-
contrib/include.am | 3 -
contrib/tor-tsocks.conf | 13 -
doc/asciidoc-helper.sh | 4 +-
doc/contrib/incentives.txt | 479 -
doc/tor-fw-helper.1.txt | 14 +-
doc/tor.1.txt | 16 +-
doc/torify.1.txt | 18 +-
src/common/address.c | 116 +-
src/common/address.h | 4 -
src/common/compat.c | 103 +-
src/common/compat.h | 2 +-
src/common/container.h | 5 -
src/common/crypto.c | 27 +-
src/common/crypto.h | 1 -
src/common/crypto_curve25519.c | 2 +-
src/common/tortls.c | 25 +
src/common/tortls.h | 2 +
src/common/util.c | 128 +-
src/common/util.h | 24 +-
src/config/geoip |20949 ++++++------------------
src/ext/eventdns.c | 7 +-
src/or/addressmap.c | 2 +-
src/or/channel.c | 24 +
src/or/channeltls.c | 2 +-
src/or/circuitbuild.c | 82 +-
src/or/circuitlist.c | 17 +-
src/or/circuitlist.h | 2 +-
src/or/circuitstats.c | 29 +-
src/or/circuituse.c | 80 +-
src/or/circuituse.h | 1 +
src/or/config.c | 28 +-
src/or/confparse.c | 7 +-
src/or/connection.c | 27 +-
src/or/connection_edge.c | 58 +-
src/or/control.c | 24 +-
src/or/control.h | 3 +-
src/or/cpuworker.c | 7 +-
src/or/dirserv.c | 302 +-
src/or/dirserv.h | 14 +-
src/or/dirvote.c | 4 +-
src/or/dirvote.h | 3 +
src/or/dnsserv.c | 11 +-
src/or/dnsserv.h | 3 +-
src/or/entrynodes.c | 96 +-
src/or/hibernate.c | 4 -
src/or/main.c | 8 +-
src/or/microdesc.c | 86 +-
src/or/microdesc.h | 4 +-
src/or/networkstatus.c | 12 -
src/or/networkstatus.h | 1 -
src/or/nodelist.c | 20 +-
src/or/nodelist.h | 1 +
src/or/or.h | 40 +-
src/or/policies.c | 18 +
src/or/policies.h | 2 +
src/or/relay.c | 94 +-
src/or/rendcommon.c | 7 -
src/or/rendcommon.h | 1 -
src/or/router.c | 17 -
src/or/router.h | 2 -
src/or/routerlist.c | 53 +-
src/or/routerlist.h | 2 -
src/or/routerparse.c | 17 +-
src/or/routerparse.h | 2 +-
src/or/status.c | 6 +
src/or/transports.c | 4 -
src/test/test.c | 18 +-
src/test/test_addr.c | 36 +
src/test/test_crypto.c | 18 +-
src/test/test_dir.c | 80 +-
src/test/test_util.c | 99 +-
src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 14 +-
src/tools/tor-fw-helper/tor-fw-helper.c | 4 +-
115 files changed, 6581 insertions(+), 17068 deletions(-)
More information about the tor-commits
mailing list