commit f59cad68dc0cc9c567508f5f7de01f492f20ee0c Merge: 95cd7f6 372773d Author: Roger Dingledine arma@torproject.org Date: Tue Feb 22 14:52:38 2011 -0500

Merge branch 'maint-0.2.1' into release-0.2.1

changes/torspec.git | 5 + doc/Makefile.am | 6 +- doc/spec/Makefile.am | 5 - doc/spec/README | 11 + doc/spec/address-spec.txt | 68 - doc/spec/bridges-spec.txt | 250 --- doc/spec/control-spec-v0.txt | 499 ----- doc/spec/control-spec.txt | 1854 ------------------- doc/spec/dir-spec-v1.txt | 315 ---- doc/spec/dir-spec-v2.txt | 897 --------- doc/spec/dir-spec.txt | 1898 -------------------- doc/spec/path-spec.txt | 423 ----- doc/spec/proposals/000-index.txt | 161 -- doc/spec/proposals/001-process.txt | 187 -- doc/spec/proposals/098-todo.txt | 109 -- doc/spec/proposals/099-misc.txt | 30 - doc/spec/proposals/100-tor-spec-udp.txt | 424 ----- doc/spec/proposals/101-dir-voting.txt | 285 --- doc/spec/proposals/102-drop-opt.txt | 40 - doc/spec/proposals/103-multilevel-keys.txt | 206 --- doc/spec/proposals/104-short-descriptors.txt | 183 -- doc/spec/proposals/105-handshake-revision.txt | 325 ---- doc/spec/proposals/106-less-tls-constraint.txt | 113 -- doc/spec/proposals/107-uptime-sanity-checking.txt | 56 - doc/spec/proposals/108-mtbf-based-stability.txt | 90 - doc/spec/proposals/109-no-sharing-ips.txt | 92 - doc/spec/proposals/110-avoid-infinite-circuits.txt | 122 -- doc/spec/proposals/111-local-traffic-priority.txt | 153 -- .../proposals/112-bring-back-pathlencoinweight.txt | 165 -- .../proposals/113-fast-authority-interface.txt | 87 - doc/spec/proposals/114-distributed-storage.txt | 441 ----- doc/spec/proposals/115-two-hop-paths.txt | 387 ---- .../proposals/116-two-hop-paths-from-guard.txt | 120 -- doc/spec/proposals/117-ipv6-exits.txt | 412 ----- doc/spec/proposals/118-multiple-orports.txt | 86 - doc/spec/proposals/119-controlport-auth.txt | 142 -- doc/spec/proposals/120-shutdown-descriptors.txt | 85 - .../121-hidden-service-authentication.txt | 778 -------- doc/spec/proposals/122-unnamed-flag.txt | 138 -- doc/spec/proposals/123-autonaming.txt | 56 - doc/spec/proposals/124-tls-certificates.txt | 315 ---- doc/spec/proposals/125-bridges.txt | 293 --- doc/spec/proposals/126-geoip-reporting.txt | 412 ----- .../proposals/127-dirport-mirrors-downloads.txt | 157 -- doc/spec/proposals/128-bridge-families.txt | 66 - doc/spec/proposals/129-reject-plaintext-ports.txt | 116 -- doc/spec/proposals/130-v2-conn-protocol.txt | 186 -- doc/spec/proposals/131-verify-tor-usage.txt | 150 -- .../proposals/132-browser-check-tor-service.txt | 147 -- doc/spec/proposals/133-unreachable-ors.txt | 128 -- doc/spec/proposals/134-robust-voting.txt | 105 -- doc/spec/proposals/135-private-tor-networks.txt | 283 --- doc/spec/proposals/136-legacy-keys.txt | 100 - doc/spec/proposals/137-bootstrap-phases.txt | 237 --- .../138-remove-down-routers-from-consensus.txt | 51 - .../139-conditional-consensus-download.txt | 94 - doc/spec/proposals/140-consensus-diffs.txt | 149 -- doc/spec/proposals/141-jit-sd-downloads.txt | 325 ---- .../142-combine-intro-and-rend-points.txt | 279 --- .../143-distributed-storage-improvements.txt | 196 -- .../proposals/144-enforce-distinct-providers.txt | 165 -- doc/spec/proposals/145-newguard-flag.txt | 41 - doc/spec/proposals/146-long-term-stability.txt | 86 - doc/spec/proposals/147-prevoting-opinions.txt | 60 - .../proposals/148-uniform-client-end-reason.txt | 59 - doc/spec/proposals/149-using-netinfo-data.txt | 44 - doc/spec/proposals/150-exclude-exit-nodes.txt | 48 - .../proposals/151-path-selection-improvements.txt | 147 -- doc/spec/proposals/152-single-hop-circuits.txt | 64 - .../153-automatic-software-update-protocol.txt | 177 -- doc/spec/proposals/154-automatic-updates.txt | 379 ---- .../155-four-hidden-service-improvements.txt | 122 -- doc/spec/proposals/156-tracking-blocked-ports.txt | 529 ------ doc/spec/proposals/157-specific-cert-download.txt | 104 -- doc/spec/proposals/158-microdescriptors.txt | 207 --- doc/spec/proposals/159-exit-scanning.txt | 144 -- doc/spec/proposals/ideas/xxx-auto-update.txt | 39 - .../proposals/ideas/xxx-bridge-disbursement.txt | 174 -- .../ideas/xxx-controllers-intercept-extends.txt | 44 - .../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 | 39 - doc/spec/proposals/ideas/xxx-port-knocking.txt | 93 - doc/spec/proposals/ideas/xxx-rate-limit-exits.txt | 63 - .../ideas/xxx-separate-streams-by-port.txt | 61 - doc/spec/proposals/ideas/xxx-what-uses-sha1.txt | 140 -- doc/spec/proposals/reindex.py | 117 -- doc/spec/rend-spec.txt | 768 -------- doc/spec/socks-extensions.txt | 79 - doc/spec/tor-spec.txt | 993 ---------- doc/spec/version-spec.txt | 45 - 92 files changed, 19 insertions(+), 20783 deletions(-)