[tor-commits] [tor/master] Accept hs descriptors even if we don't see an HSDir for us

nickm at torproject.org nickm at torproject.org
Sun May 15 15:22:05 UTC 2011


commit 7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 00:51:11 2011 -0400

    Accept hs descriptors even if we don't see an HSDir for us
    
    The old behavior contributed to unreliability when hidden services and
    hsdirs had different consensus versions, and so had different opinions
    about who should be cacheing hsdir info.
    
    Bugfix on 0.2.0.10-alpha; based on discussions surrounding bug 2732.
---
 changes/bug2732-simple |    7 +++++++
 src/or/routerlist.c    |    5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/changes/bug2732-simple b/changes/bug2732-simple
new file mode 100644
index 0000000..3678361
--- /dev/null
+++ b/changes/bug2732-simple
@@ -0,0 +1,7 @@
+  o Minor bugfixes
+    - Do not reject hidden service descriptors simply because we don't
+      think we have not been assigned the HSDir flag.  Clients and
+      hidden services can have a more up-to-date view of the network
+      consensus, and if they think that the directory authorities
+      list us a HSDir, we might actually be one.  Related to bug 2732;
+      bugfix on 0.2.0.10-alpha.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f567ccd..354e026 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5778,11 +5778,6 @@ hid_serv_acting_as_directory(void)
              "being a hidden service directory.");
     return 0;
   }
-  if (!rs->is_hs_dir) {
-    log_info(LD_REND, "We're not listed as a hidden service directory in "
-             "the consensus, so we won't be one.");
-    return 0;
-  }
   return 1;
 }
 





More information about the tor-commits mailing list