[tor-commits] [tor/master] When downloading bridge descs from a bridge authority, always be anonymous
nickm at torproject.org
nickm at torproject.org
Thu May 31 16:28:25 UTC 2012
commit 8f070ecbc000c3ca32ff1467716f777a44d0eda4
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Apr 27 11:27:32 2012 -0400
When downloading bridge descs from a bridge authority, always be anonymous
---
changes/bug1938 | 4 ++++
src/or/directory.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug1938 b/changes/bug1938
new file mode 100644
index 0000000..13d2a37
--- /dev/null
+++ b/changes/bug1938
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - When fetching a bridge descriptor from a bridge authority,
+ always do so anonymously, whether we have been able to open
+ circuits or not. Partial fix for bug 1938; bugfix on 2.0.7-alpha.
diff --git a/src/or/directory.c b/src/or/directory.c
index 6394aec..3d2b955 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -130,8 +130,9 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose)
{
if (get_options()->AllDirActionsPrivate)
return 1;
- if (router_purpose == ROUTER_PURPOSE_BRIDGE && can_complete_circuit)
- return 1; /* if no circuits yet, we may need this info to bootstrap. */
+ if (router_purpose == ROUTER_PURPOSE_BRIDGE)
+ return 1; /* if no circuits yet, this might break bootstrapping, but it's
+ * needed to be safe. */
if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR ||
dir_purpose == DIR_PURPOSE_UPLOAD_VOTE ||
dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES ||
More information about the tor-commits
mailing list