diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-31 12:24:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-31 12:24:02 -0400 |
| commit | 155543d26e21f992237c2fff159869cc663ae049 (patch) | |
| tree | 03d7376b1ef063b1a0194e237b57946cfa985e55 | |
| parent | 11bf5585aafa4ea590b4f4b62a75323fb5907d95 (diff) | |
| parent | 8f070ecbc000c3ca32ff1467716f777a44d0eda4 (diff) | |
| download | tor-155543d26e21f992237c2fff159869cc663ae049.tar.gz tor-155543d26e21f992237c2fff159869cc663ae049.zip | |
Merge remote-tracking branch 'public/bug1938'
| -rw-r--r-- | changes/bug1938 | 4 | ||||
| -rw-r--r-- | 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 0000000000..13d2a37776 --- /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 6394aece71..3d2b95565c 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 || |