diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 00:51:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 00:53:07 -0400 |
| commit | 7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8 (patch) | |
| tree | e6ae9a16bbcc16ee763d4f242502156cccbffb7a | |
| parent | b47f574c1e27b8665e9e2658409645a3831e7aa4 (diff) | |
| download | tor-7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8.tar tor-7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8.tar.gz | |
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.
| -rw-r--r-- | changes/bug2732-simple | 7 | ||||
| -rw-r--r-- | 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 000000000..367836152 --- /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 f567ccdf3..354e02630 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; } |