[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e
Merge: 7236bb7 228b77f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 11:23:02 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/routerlist.c

 changes/bug2732-simple |    7 +++++++
 src/or/routerlist.c    |   18 ------------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --cc src/or/routerlist.c
index 8d25eaa,c26f003..2b38319
--- 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) {