commit b99a8d54271dfd26c5c3a2d3086226974b32373e Merge: 90f9caf d673479 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 21 16:10:31 2011 -0500

Merge remote branch 'origin/maint-0.2.2'

Conflicts: doc/spec/Makefile.am doc/spec/control-spec.txt doc/spec/dir-spec.txt doc/spec/proposals/000-index.txt doc/spec/proposals/001-process.txt doc/spec/proposals/ideas/xxx-encrypted-services.txt

doc/Makefile.am | 7 +- doc/spec/Makefile.am | 12 - doc/spec/README | 10 + doc/spec/address-spec.txt | 58 - doc/spec/bridges-spec.txt | 249 -- doc/spec/control-spec-v0.txt | 498 ---- doc/spec/control-spec.txt | 2001 ---------------- doc/spec/dir-spec-v1.txt | 314 --- doc/spec/dir-spec-v2.txt | 896 ------- doc/spec/dir-spec.txt | 2440 -------------------- doc/spec/path-spec.txt | 657 ------ doc/spec/proposals/000-index.txt | 196 -- 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/171-separate-streams.txt | 357 --- 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 -- .../proposals/175-automatic-node-promotion.txt | 238 -- doc/spec/proposals/176-revising-handshake.txt | 623 ----- doc/spec/proposals/177-flag-abstention.txt | 104 - 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 - doc/spec/proposals/ideas/xxx-crypto-migration.txt | 384 --- .../proposals/ideas/xxx-crypto-requirements.txt | 72 - .../ideas/xxx-draft-spec-for-TLS-normalization.txt | 360 --- .../proposals/ideas/xxx-encrypted-services.txt | 66 - .../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 - .../proposals/ideas/xxx-pluggable-transport.txt | 312 --- doc/spec/proposals/ideas/xxx-port-knocking.txt | 91 - doc/spec/proposals/ideas/xxx-rate-limit-exits.txt | 63 - 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-fw-helper-spec.txt | 57 - doc/spec/tor-spec.txt | 1004 -------- doc/spec/version-spec.txt | 44 - 117 files changed, 11 insertions(+), 27211 deletions(-)

diff --combined doc/Makefile.am index c8bffc9,bc3d8df..6cc0ea9 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@@ -1,4 -1,3 +1,3 @@@ - # We use a two-step process to generate documentation from asciidoc files. # # First, we use asciidoc/a2x to process the asciidoc files into .1.in and @@@ -14,11 -13,7 +13,11 @@@ # just use the .1 and .html files.

if USE_ASCIIDOC +if USE_FW_HELPER +asciidoc_files = tor tor-gencert tor-resolve torify tor-fw-helper +else asciidoc_files = tor tor-gencert tor-resolve torify +endif html_in = $(asciidoc_files:=.html.in) man_in = $(asciidoc_files:=.1.in) txt_in = $(asciidoc_files:=.1.txt) @@@ -36,16 -31,12 +35,12 @@@ endi EXTRA_DIST = HACKING asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ tor-rpm-creation.txt \ - tor-win32-mingw-creation.txt + tor-win32-mingw-creation.txt spec/README

docdir = @docdir@

asciidoc_product = $(nodist_man_MANS) $(doc_DATA)

- SUBDIRS = spec - - DIST_SUBDIRS = spec - # Generate the html documentation from asciidoc, but don't do # machine-specific replacements yet $(html_in) : @@@ -55,7 -46,6 +50,7 @@@ tor.html.in : tor.1.tx torify.html.in : torify.1.txt tor-gencert.html.in : tor-gencert.1.txt tor-resolve.html.in : tor-resolve.1.txt +tor-fw-helper.html.in : tor-fw-helper.1.txt

# Generate the manpage from asciidoc, but don't do # machine-specific replacements yet @@@ -66,7 -56,6 +61,7 @@@ tor.1.in : tor.1.tx torify.1.in : torify.1.txt tor-gencert.1.in : tor-gencert.1.txt tor-resolve.1.in : tor-resolve.1.txt +tor-fw-helper.1.in : tor-fw-helper.1.txt

# use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. @@@ -80,12 -69,10 +75,12 @@@ tor.1 : tor.1.i torify.1 : torify.1.in tor-gencert.1 : tor-gencert.1.in tor-resolve.1 : tor-resolve.1.in +tor-fw-helper.1 : tor-fw-helper.1.in tor.html : tor.html.in torify.html : torify.html.in tor-gencert.html : tor-gencert.html.in tor-resolve.html : tor-resolve.html.in +tor-fw-helper.html : tor-fw-helper.html.in

CLEANFILES = $(asciidoc_product) config.log DISTCLEANFILES = $(html_in) $(man_in)