Nick Mathewson f9bb3ced51 Merge remote branch 'origin/maint-0.2.2' ... Resolved trivial one-line conflicts. Conflicts: src/or/dirserv.c src/or/rephist.c		2011-03-08 16:10:40 -05:00
..
contrib	fix typo and naming convention	2009-04-26 03:59:35 +00:00
spec	prefer https urls	2011-02-22 14:39:09 -05:00
asciidoc-helper.sh	Build the tor-fw-helper manpage	2010-09-30 23:13:24 +02:00
HACKING	update spec locations	2011-03-08 15:31:04 -05: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 branch 'origin/maint-0.2.2'	2011-03-04 00:25:14 -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