[tor-commits] [tor/master] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

nickm at torproject.org nickm at torproject.org
Mon Feb 21 21:10:17 UTC 2011


commit d673479ebaa29b2dc8f227c342785112c945ec18
Merge: 9b745cd 7bdb7d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 21 16:09:23 2011 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
    
    Conflicts:
    	doc/Makefile.am
    	doc/spec/Makefile.am
    	doc/spec/address-spec.txt
    	doc/spec/bridges-spec.txt
    	doc/spec/control-spec-v0.txt
    	doc/spec/control-spec.txt
    	doc/spec/dir-spec-v1.txt
    	doc/spec/dir-spec-v2.txt
    	doc/spec/dir-spec.txt
    	doc/spec/path-spec.txt
    	doc/spec/proposals/000-index.txt
    	doc/spec/proposals/001-process.txt
    	doc/spec/proposals/098-todo.txt
    	doc/spec/proposals/099-misc.txt
    	doc/spec/proposals/100-tor-spec-udp.txt
    	doc/spec/proposals/101-dir-voting.txt
    	doc/spec/proposals/102-drop-opt.txt
    	doc/spec/proposals/103-multilevel-keys.txt
    	doc/spec/proposals/104-short-descriptors.txt
    	doc/spec/proposals/105-handshake-revision.txt
    	doc/spec/proposals/106-less-tls-constraint.txt
    	doc/spec/proposals/107-uptime-sanity-checking.txt
    	doc/spec/proposals/108-mtbf-based-stability.txt
    	doc/spec/proposals/109-no-sharing-ips.txt
    	doc/spec/proposals/110-avoid-infinite-circuits.txt
    	doc/spec/proposals/111-local-traffic-priority.txt
    	doc/spec/proposals/112-bring-back-pathlencoinweight.txt
    	doc/spec/proposals/113-fast-authority-interface.txt
    	doc/spec/proposals/114-distributed-storage.txt
    	doc/spec/proposals/115-two-hop-paths.txt
    	doc/spec/proposals/116-two-hop-paths-from-guard.txt
    	doc/spec/proposals/117-ipv6-exits.txt
    	doc/spec/proposals/118-multiple-orports.txt
    	doc/spec/proposals/119-controlport-auth.txt
    	doc/spec/proposals/120-shutdown-descriptors.txt
    	doc/spec/proposals/121-hidden-service-authentication.txt
    	doc/spec/proposals/122-unnamed-flag.txt
    	doc/spec/proposals/123-autonaming.txt
    	doc/spec/proposals/124-tls-certificates.txt
    	doc/spec/proposals/125-bridges.txt
    	doc/spec/proposals/126-geoip-reporting.txt
    	doc/spec/proposals/127-dirport-mirrors-downloads.txt
    	doc/spec/proposals/128-bridge-families.txt
    	doc/spec/proposals/129-reject-plaintext-ports.txt
    	doc/spec/proposals/130-v2-conn-protocol.txt
    	doc/spec/proposals/131-verify-tor-usage.txt
    	doc/spec/proposals/132-browser-check-tor-service.txt
    	doc/spec/proposals/134-robust-voting.txt
    	doc/spec/proposals/135-private-tor-networks.txt
    	doc/spec/proposals/137-bootstrap-phases.txt
    	doc/spec/proposals/138-remove-down-routers-from-consensus.txt
    	doc/spec/proposals/140-consensus-diffs.txt
    	doc/spec/proposals/141-jit-sd-downloads.txt
    	doc/spec/proposals/142-combine-intro-and-rend-points.txt
    	doc/spec/proposals/143-distributed-storage-improvements.txt
    	doc/spec/proposals/145-newguard-flag.txt
    	doc/spec/proposals/146-long-term-stability.txt
    	doc/spec/proposals/147-prevoting-opinions.txt
    	doc/spec/proposals/148-uniform-client-end-reason.txt
    	doc/spec/proposals/149-using-netinfo-data.txt
    	doc/spec/proposals/150-exclude-exit-nodes.txt
    	doc/spec/proposals/151-path-selection-improvements.txt
    	doc/spec/proposals/152-single-hop-circuits.txt
    	doc/spec/proposals/153-automatic-software-update-protocol.txt
    	doc/spec/proposals/154-automatic-updates.txt
    	doc/spec/proposals/155-four-hidden-service-improvements.txt
    	doc/spec/proposals/156-tracking-blocked-ports.txt
    	doc/spec/proposals/157-specific-cert-download.txt
    	doc/spec/proposals/158-microdescriptors.txt
    	doc/spec/proposals/159-exit-scanning.txt
    	doc/spec/proposals/ideas/xxx-hide-platform.txt
    	doc/spec/proposals/ideas/xxx-port-knocking.txt
    	doc/spec/proposals/ideas/xxx-separate-streams-by-port.txt
    	doc/spec/proposals/ideas/xxx-what-uses-sha1.txt
    	doc/spec/proposals/reindex.py
    	doc/spec/rend-spec.txt
    	doc/spec/socks-extensions.txt
    	doc/spec/tor-spec.txt
    	doc/spec/version-spec.txt

 doc/Makefile.am                                    |    7 +-
 doc/spec/Makefile.am                               |    5 -
 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                          | 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 -
 109 files changed, 11 insertions(+), 24652 deletions(-)

diff --combined doc/Makefile.am
index 693378c,2959813..bc3d8df
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -1,83 -1,12 +1,78 @@@
- 
 +# 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
 +# .html.in files (see the asciidoc-helper.sh script). These are the same as
 +# the regular .1 and .html files, except that they still have some autoconf
 +# variables set in them.
 +#
 +# Second, we use config.status to turn .1.in files into .1 files and
 +# .html.in files into .html files.
 +#
 +# We do the steps in this order so that we can ship the .*.in files as
 +# part of the source distribution, so that people without asciidoc can
 +# just use the .1 and .html files.
  
 -EXTRA_DIST = HACKING                                         \
 -             tor-resolve.1 tor-gencert.1                     \
 -             tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
 +if USE_ASCIIDOC
 +asciidoc_files = tor tor-gencert tor-resolve torify
 +html_in = $(asciidoc_files:=.html.in)
 +man_in = $(asciidoc_files:=.1.in)
 +txt_in = $(asciidoc_files:=.1.txt)
 +nodist_man_MANS = $(asciidoc_files:=.1)
 +doc_DATA = $(asciidoc_files:=.html)
 +else
 +asciidoc_files =
 +html_in =
 +man_in =
 +txt_in =
 +nodist_man_MANS =
 +doc_DATA =
 +endif
 +
 +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
  
 -man_MANS = tor.1 tor-resolve.1 tor-gencert.1
 +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) :
 +	$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@
 +
 +tor.html.in : tor.1.txt
 +torify.html.in : torify.1.txt
 +tor-gencert.html.in : tor-gencert.1.txt
 +tor-resolve.html.in : tor-resolve.1.txt
 +
 +# Generate the manpage from asciidoc, but don't do
 +# machine-specific replacements yet
 +$(man_in) :
 +	$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@
 +
 +tor.1.in : tor.1.txt
 +torify.1.in : torify.1.txt
 +tor-gencert.1.in : tor-gencert.1.txt
 +tor-resolve.1.in : tor-resolve.1.txt
  
 -SUBDIRS = design-paper
 +# use ../config.status to swap all machine-specific magic strings
 +# in the asciidoc with their replacements.
 +$(asciidoc_product) :
 +	if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \
 +		cp $(top_srcdir)/doc/$@.in .; \
 +	fi
 +	../config.status --file=$@;
  
 -DIST_SUBDIRS = design-paper
 +tor.1 : tor.1.in
 +torify.1 : torify.1.in
 +tor-gencert.1 : tor-gencert.1.in
 +tor-resolve.1 : tor-resolve.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
  
 +CLEANFILES = $(asciidoc_product) config.log
 +DISTCLEANFILES = $(html_in) $(man_in)



_______________________________________________
tor-commits mailing list
tor-commits at lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits



More information about the tor-commits mailing list