Merge remote branch 'origin/maint-0.2.2'

Fixed conflict: router_get_my_routerinfo now returns const

Conflicts:
	src/or/router.c
This commit is contained in:
Nick Mathewson
2011-03-14 17:22:38 -04:00
2 changed files with 14 additions and 15 deletions
+9
View File
@@ -0,0 +1,9 @@
o Minor bugfixes:
- When we restart our relay, we might get a successful connection
from the outside before we've started our reachability tests,
triggering a warning: "ORPort found reachable, but I have no
routerinfo yet. Failing to inform controller of success." This
bug was harmless unless Tor is running under a controller
like Vidalia, in which case the controller would never get a
REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha;
fixes bug 1172.