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

Conflicts:
	src/or/routerlist.c

diff --cc src/or/routerlist.c
index 8d25eaa8628e4b27911b93345ccea3cb253d5736,c26f00387d1f1b3fbf8decea0386f3ddea42d2b9..2b383198a86bf667257864577daf7e398d2fcb0b
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -5842,9 -5757,7 +5842,7 @@@ hid_serv_get_responsible_directories(sm
  int
  hid_serv_acting_as_directory(void)
  {
 -  routerinfo_t *me = router_get_my_routerinfo();
 +  const routerinfo_t *me = router_get_my_routerinfo();
-   networkstatus_t *c;
-   const routerstatus_t *rs;
    if (!me)
      return 0;
    if (!get_options()->HidServDirectoryV2) {