Nick Mathewson 06be6105e4 Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	src/or/config.c

2011-08-17 12:00:44 -04:00

..

bug1692

Add changes file.

2011-08-09 03:02:40 +05:00

bug2930

…

bug3550

…

bug3607

…

bug3615

…

bug3643

Ignore deprecation warnings on OS X

2011-08-10 23:12:09 +02:00

bug3700

Don't warn on http connection to my orport

2011-08-11 20:37:51 +02:00

bug3732

Remove extra quotation marks around the result of esc_for_log

2011-08-15 10:54:19 -04:00

bug3747

Don't write ControlPorts to disk till after we setuid and make datadir

2011-08-17 11:22:16 -04:00

fmt_addr

…

geoip-august2011

…

microdescs_on

…

nmake

…

optimistic-client

…

prop171

…