commit 999c3c97d2621184ea1b7a0f5b7222ae1f03793b Merge: 7360b53 aa178aa Author: Roger Dingledine arma@torproject.org Date: Fri Feb 25 13:48:06 2011 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

changes/1863_bwhist | 16 + changes/bug2366 | 8 + changes/bug2403 | 6 + changes/bug2504 | 5 + changes/bug2572 | 5 + changes/log_domains | 12 + changes/torspec.git | 5 + configure.in | 2 +- doc/Makefile.am | 7 +- doc/spec/Makefile.am | 5 - doc/spec/README | 11 + doc/spec/address-spec.txt | 58 - doc/spec/bridges-spec.txt | 249 -- doc/spec/control-spec-v0.txt | 498 ---- doc/spec/control-spec.txt | 1967 ---------------- doc/spec/dir-spec-v1.txt | 314 --- doc/spec/dir-spec-v2.txt | 896 -------- doc/spec/dir-spec.txt | 2426 -------------------- doc/spec/path-spec.txt | 657 ------ doc/spec/proposals/000-index.txt | 188 -- doc/spec/proposals/001-process.txt | 184 -- doc/spec/proposals/098-todo.txt | 107 - doc/spec/proposals/099-misc.txt | 28 - doc/spec/proposals/100-tor-spec-udp.txt | 422 ---- doc/spec/proposals/101-dir-voting.txt | 283 --- doc/spec/proposals/102-drop-opt.txt | 38 - doc/spec/proposals/103-multilevel-keys.txt | 204 -- doc/spec/proposals/104-short-descriptors.txt | 181 -- doc/spec/proposals/105-handshake-revision.txt | 323 --- doc/spec/proposals/106-less-tls-constraint.txt | 111 - doc/spec/proposals/107-uptime-sanity-checking.txt | 54 - doc/spec/proposals/108-mtbf-based-stability.txt | 88 - doc/spec/proposals/109-no-sharing-ips.txt | 90 - doc/spec/proposals/110-avoid-infinite-circuits.txt | 120 - doc/spec/proposals/111-local-traffic-priority.txt | 151 -- .../proposals/112-bring-back-pathlencoinweight.txt | 163 -- .../proposals/113-fast-authority-interface.txt | 85 - doc/spec/proposals/114-distributed-storage.txt | 439 ---- doc/spec/proposals/115-two-hop-paths.txt | 385 ---- .../proposals/116-two-hop-paths-from-guard.txt | 118 - doc/spec/proposals/117-ipv6-exits.txt | 410 ---- doc/spec/proposals/118-multiple-orports.txt | 84 - doc/spec/proposals/119-controlport-auth.txt | 140 -- doc/spec/proposals/120-shutdown-descriptors.txt | 83 - .../121-hidden-service-authentication.txt | 776 ------- doc/spec/proposals/122-unnamed-flag.txt | 136 -- doc/spec/proposals/123-autonaming.txt | 54 - doc/spec/proposals/124-tls-certificates.txt | 313 --- doc/spec/proposals/125-bridges.txt | 291 --- doc/spec/proposals/126-geoip-reporting.txt | 410 ---- .../proposals/127-dirport-mirrors-downloads.txt | 155 -- doc/spec/proposals/128-bridge-families.txt | 64 - doc/spec/proposals/129-reject-plaintext-ports.txt | 114 - doc/spec/proposals/130-v2-conn-protocol.txt | 184 -- doc/spec/proposals/131-verify-tor-usage.txt | 148 -- .../proposals/132-browser-check-tor-service.txt | 145 -- doc/spec/proposals/133-unreachable-ors.txt | 128 - doc/spec/proposals/134-robust-voting.txt | 123 - doc/spec/proposals/135-private-tor-networks.txt | 281 --- doc/spec/proposals/136-legacy-keys.txt | 100 - doc/spec/proposals/137-bootstrap-phases.txt | 235 -- .../138-remove-down-routers-from-consensus.txt | 49 - .../139-conditional-consensus-download.txt | 94 - doc/spec/proposals/140-consensus-diffs.txt | 156 -- doc/spec/proposals/141-jit-sd-downloads.txt | 323 --- .../142-combine-intro-and-rend-points.txt | 277 --- .../143-distributed-storage-improvements.txt | 194 -- .../proposals/144-enforce-distinct-providers.txt | 165 -- doc/spec/proposals/145-newguard-flag.txt | 39 - doc/spec/proposals/146-long-term-stability.txt | 84 - doc/spec/proposals/147-prevoting-opinions.txt | 58 - .../proposals/148-uniform-client-end-reason.txt | 57 - doc/spec/proposals/149-using-netinfo-data.txt | 42 - doc/spec/proposals/150-exclude-exit-nodes.txt | 47 - .../proposals/151-path-selection-improvements.txt | 148 -- doc/spec/proposals/152-single-hop-circuits.txt | 62 - .../153-automatic-software-update-protocol.txt | 175 -- doc/spec/proposals/154-automatic-updates.txt | 377 --- .../155-four-hidden-service-improvements.txt | 120 - doc/spec/proposals/156-tracking-blocked-ports.txt | 527 ----- doc/spec/proposals/157-specific-cert-download.txt | 102 - doc/spec/proposals/158-microdescriptors.txt | 198 -- doc/spec/proposals/159-exit-scanning.txt | 142 -- doc/spec/proposals/160-bandwidth-offset.txt | 105 - .../161-computing-bandwidth-adjustments.txt | 174 -- doc/spec/proposals/162-consensus-flavors.txt | 188 -- doc/spec/proposals/163-detecting-clients.txt | 115 - doc/spec/proposals/164-reporting-server-status.txt | 91 - doc/spec/proposals/165-simple-robust-voting.txt | 133 -- .../proposals/166-statistics-extra-info-docs.txt | 391 ---- doc/spec/proposals/167-params-in-consensus.txt | 47 - doc/spec/proposals/168-reduce-circwindow.txt | 134 -- .../proposals/169-eliminating-renegotiation.txt | 404 ---- doc/spec/proposals/170-user-path-config.txt | 95 - doc/spec/proposals/172-circ-getinfo-option.txt | 138 -- .../proposals/173-getinfo-option-expansion.txt | 101 - doc/spec/proposals/174-optimistic-data-server.txt | 242 -- doc/spec/proposals/ideas/xxx-auto-update.txt | 39 - .../proposals/ideas/xxx-bridge-disbursement.txt | 174 -- doc/spec/proposals/ideas/xxx-bwrate-algs.txt | 106 - .../ideas/xxx-choosing-crypto-in-tor-protocol.txt | 138 -- .../ideas/xxx-controllers-intercept-extends.txt | 44 - .../proposals/ideas/xxx-encrypted-services.txt | 18 - .../proposals/ideas/xxx-exit-scanning-outline.txt | 44 - doc/spec/proposals/ideas/xxx-geoip-survey-plan.txt | 137 -- .../proposals/ideas/xxx-grand-scaling-plan.txt | 97 - doc/spec/proposals/ideas/xxx-hide-platform.txt | 37 - doc/spec/proposals/ideas/xxx-port-knocking.txt | 91 - doc/spec/proposals/ideas/xxx-rate-limit-exits.txt | 63 - .../ideas/xxx-separate-streams-by-port.txt | 59 - doc/spec/proposals/ideas/xxx-using-spdy.txt | 143 -- doc/spec/proposals/ideas/xxx-what-uses-sha1.txt | 247 -- doc/spec/proposals/reindex.py | 117 - doc/spec/rend-spec.txt | 966 -------- doc/spec/socks-extensions.txt | 78 - doc/spec/tor-spec.txt | 1004 -------- doc/spec/version-spec.txt | 44 - doc/tor.1.txt | 28 + src/common/compat.c | 2 +- src/common/log.c | 92 +- src/common/torlog.h | 1 + src/or/circuitbuild.c | 3 +- src/or/config.c | 11 +- src/or/or.h | 11 +- src/or/policies.c | 8 + src/or/policies.h | 1 + src/or/rephist.c | 295 ++-- src/or/router.c | 17 +- 128 files changed, 377 insertions(+), 24815 deletions(-)

diff --combined configure.in index 1ec100e,f30402d..4d2f726 --- a/configure.in +++ b/configure.in @@@ -4,7 -4,7 +4,7 @@@ dnl Copyright (c) 2007-2008, The Tor Pr dnl See LICENSE for licensing information

AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.19-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.2.22-alpha) AM_CONFIG_HEADER(orconfig.h)

AC_CANONICAL_HOST @@@ -946,7 -946,7 +946,7 @@@ f

CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"

- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) + AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh]) AC_OUTPUT

if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then