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

Conflicts:
	src/or/connection_edge.c

Conflicted on a router->node transition; fix was easy.

2011-09-06 20:55:31 -04:00

..

bug3923

Fix assertion in addressmap_clear_excluded_trackexithosts

2011-09-06 20:26:20 -04:00