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

Conflicts:
	src/or/connection.c

2011-05-09 13:36:40 -04:00

..

bug3118

Link to libevent_openssl statically when requested

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

dirvote_null_deref

Fix potential null pointer deref during dirvote

2011-05-09 13:19:46 -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