Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/connection_edge.c

Conflicted on a router->node transition; fix was easy.
This commit is contained in:
Nick Mathewson
2011-09-06 20:55:31 -04:00
2 changed files with 9 additions and 6 deletions
+5
View File
@@ -0,0 +1,5 @@
o Major bugfies:
- Avoid an assertion failure when reloading a configuration with
TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes
bug 3923; bugfix on 0.2.2.25-alpha.