Nick Mathewson 8c2affe637 Merge remote branch 'origin/maint-0.2.2' ... Conflicts: src/or/config.c src/or/cpuworker.c		2010-11-15 14:14:13 -05:00
..
proposals	renumber, clean whitespace	2010-09-30 22:04:52 -04:00
address-spec.txt	Change Natd into NATD in our options.	2010-11-10 15:48:26 +01:00
bridges-spec.txt	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00
control-spec-v0.txt	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00
control-spec.txt	Make logging resolution configurable.	2010-10-04 08:15:18 +02:00
dir-spec-v1.txt	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00
dir-spec-v2.txt	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00
dir-spec.txt	Add GeoIP file digest to extra-info descriptor.	2010-11-09 09:42:36 +01:00
Makefile.am	Split long lines in configure.in and Makefile.am files	2010-11-11 14:22:48 -05:00
path-spec.txt	Merge remote branch 'mikeperry/cbt-bugfixes3'	2010-06-29 18:57:50 -04:00
rend-spec.txt	Merge commit 'karsten/rendspec-koryk'	2010-08-25 16:44:37 -04:00
socks-extensions.txt	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00
tor-fw-helper-spec.txt	Changes to tor-fw-helper, some based on Nick's review	2010-09-30 11:39:34 -04:00
tor-spec.txt	Merge branch 'bug1184'	2010-09-15 14:20:28 -04:00
version-spec.txt	Remove all svn metadata minus what I missed.	2009-05-05 17:05:46 +02:00