From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 May 2011 15:23:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/routerlist.c
---

2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e
diff --cc src/or/routerlist.c
index 8d25eaa862,c26f00387d..2b383198a8
--- a/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) {