Merge remote branch 'origin/maint-0.2.2'

Fixed conflict: router_get_my_routerinfo now returns const

Conflicts:
	src/or/router.c

diff --cc src/or/router.c
index 3f1a0a0e028a31c87a08788fcfe33730dcff2c61,c15b9b236ea3df5a58788abda439deeafc4bf3cd..eb4d6b5d40f6c34752e4b6476eeee94b2f6b79ca
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -886,8 -881,8 +886,8 @@@ consider_testing_reachability(int test_
  void
  router_orport_found_reachable(void)
  {
-   if (!can_reach_or_port) {
-     const routerinfo_t *me = router_get_my_routerinfo();
 -  routerinfo_t *me = router_get_my_routerinfo();
++  const routerinfo_t *me = router_get_my_routerinfo();
+   if (!can_reach_or_port && me) {
      log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from "
                 "the outside. Excellent.%s",
                 get_options()->_PublishServerDescriptor != NO_AUTHORITY ?
@@@ -909,8 -899,8 +904,8 @@@
  void
  router_dirport_found_reachable(void)
  {
-   if (!can_reach_dir_port) {
-     const routerinfo_t *me = router_get_my_routerinfo();
 -  routerinfo_t *me = router_get_my_routerinfo();
++  const routerinfo_t *me = router_get_my_routerinfo();
+   if (!can_reach_dir_port && me) {
      log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable "
                 "from the outside. Excellent.");
      can_reach_dir_port = 1;