Nick Mathewson d673479eba 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		2011-02-21 16:09:23 -05:00
..
contrib	fix typo and naming convention	2009-04-26 03:59:35 +00:00
spec	Remove specs from 0.2.1 branch: they have moved to a new repository.	2011-02-21 16:02:16 -05:00
asciidoc-helper.sh	In asciidoc-helper.sh, be more verbose when a2x fails.	2010-06-07 11:40:42 -04:00
HACKING	Initial oprofile instructions based on original by weasel.	2010-09-12 19:37:04 -04:00
Makefile.am	Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2	2011-02-21 16:09:23 -05:00
TODO	move the todo.external file into svn projects	2009-07-14 23:35:34 -04:00
TODO.021	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00
TODO.022	Remove TODO items that are either done or moved to the tracker	2010-07-06 18:10:53 -04:00
TODO.external	move the todo.external file into svn projects	2009-07-14 23:35:34 -04:00
TODO.future	Remove TODO items that are either done or moved to the tracker	2010-07-06 18:10:53 -04:00
tor-gencert.1.txt	Convert the tor-gencert manpage to asciidoc	2010-01-27 12:13:10 +01:00
tor-resolve.1.txt	Describe tor-resolve defaults. Bug 2364.	2011-01-09 15:40:40 -05:00
tor-rpm-creation.txt	updated rpm instructions for realtime libevent.	2009-07-02 17:57:47 -04:00
tor-win32-mingw-creation.txt	fix the win32 build instructions for openssl.	2010-02-17 23:07:51 -05:00
tor.1.txt	Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2	2011-02-10 16:01:19 -05:00
torify.1.txt	Convert the torify manpage to asciidoc	2010-01-27 12:13:10 +01:00
translations.txt	fix some typos	2009-12-19 05:12:00 -05:00
v3-authority-howto.txt	new v3 authorities will want the one that includes lefkada	2007-12-13 00:01:49 +00:00