Nick Mathewson b99a8d5427 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

2011-02-21 16:10:31 -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

Build the tor-fw-helper manpage

2010-09-30 23:13:24 +02: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.2'

2011-02-21 16:10:31 -05:00

nodefamily_routerset

Implement node-based router family code

2010-10-01 18:14:27 -04: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-fw-helper.1.txt

Build the tor-fw-helper manpage

2010-09-30 23:13:24 +02: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 'origin/maint-0.2.2'

2011-02-10 16:01:29 -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