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

Replace files in stats/ rather than appending to them.

2011-08-04 20:57:29 +02:00

bug3550

Make --quiet and --hush apply to default logs, not only initial logs

2011-08-04 14:23:51 -04:00

bug3607

Untangle first sentence of changes/bug3607

2011-07-19 11:14:01 -04:00

bug3615

Fix spurious warning in bufferevent socks parsing

2011-07-19 20:40:15 -04:00

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

Check return value in fmt_addr

2011-07-20 13:17:48 -04:00

geoip-august2011

Update to the August 2011 GeoIP database.

2011-08-08 16:57:01 +02:00

microdescs_on

Turn on microdescriptors for clients

2011-07-11 16:54:43 -04:00

nmake

Initial patch to build Tor with msvc and nmake

2011-08-01 12:36:59 -04:00

optimistic-client

Add an OptimisticData option to control client-side optimistic data

2011-07-20 14:14:21 -04:00

prop171

Implement stream isolation

2011-07-19 01:58:45 -04:00