Nick Mathewson 37e3fb8af2 Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	src/or/connection_edge.c

2011-05-15 11:44:51 -04:00

..

bug1345

Handle transitions in Automap*, VirtualAddrNetwork correctly

2011-05-13 16:59:31 -04:00

bug1352

Rate-limit v2 networkstatus download fail warnings

2011-04-28 21:25:24 -04:00

bug2503

Add changes file for bug2503

2011-05-12 18:49:28 -04:00

bug2732-simple

Accept hs descriptors even if we don't see an HSDir for us

2011-05-12 00:53:07 -04:00

bug3022

Only authorities should automatically download v2 networkstatus documents

2011-04-28 21:06:07 -04:00

bug3118

Link to libevent_openssl statically when requested

2011-05-06 15:38:32 +02:00

bug3122_memcmp

Add a data-independent variant of memcmp and a d-i memeq function.

2011-05-11 16:12:33 -04:00

bug3135

Fix crash when read_file_to_string() fails in SAVECONF

2011-05-11 22:05:41 -04:00

bug3183

Add a changes file for bug3183.

2011-05-15 11:08:46 -04:00

dirvote_null_deref

Fix potential null pointer deref during dirvote

2011-05-09 13:19:46 -04:00

feature3076

Add a ControlPortFileGroupWritable option

2011-05-13 10:41:29 -04:00

geoip-may2011

Update to the May 1 2011 Maxmind GeoLite Country database

2011-05-10 23:04:11 -04:00

md_cache_replace

Unmap microdesc cache before replacing it.

2011-05-12 11:19:52 -04:00

mdesc_null_deref

Fix a potential null deref when rebuilding md cache

2011-05-09 13:19:45 -04:00

microdesc_use

Code to make clients fetch and use microdescriptors for circuit building

2011-05-05 20:54:12 -04:00