Nick Mathewson 69f7c0385b Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased ...

There was a merge conflict in routerlist.c due to the new node_t logic.

Conflicts:
	src/or/routerlist.c

2011-02-04 12:26:59 -05:00

..

proposals

tweak xxx-pluggable-transport based on comments from sjmurdoch

2011-02-02 15:34:59 -05: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

GETINFO options for querying traffic usage

2011-01-07 12:15:14 -05: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

Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased

2011-02-04 12:26:59 -05:00

Makefile.am

Split long lines in configure.in and Makefile.am files

2010-11-11 14:22:48 -05:00

path-spec.txt

Fix a typo spotted by Roger

2011-01-15 19:42:17 +01: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