nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug1938'

Browse Source
This commit is contained in:
Nick Mathewson 2012-05-31 12:24:02 -04:00
commit 155543d26e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug1938 Normal file
View File

@ -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.

5
src/or/directory.c
View File

@ -130,8 +130,9 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose)
{ {
if (get_options()->AllDirActionsPrivate) if (get_options()->AllDirActionsPrivate)
return 1; return 1;
if (router_purpose == ROUTER_PURPOSE_BRIDGE && can_complete_circuit) if (router_purpose == ROUTER_PURPOSE_BRIDGE)
return 1; /* if no circuits yet, we may need this info to bootstrap. */ return 1; /* if no circuits yet, this might break bootstrapping, but it's
* needed to be safe. */
if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR || if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR ||
dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || dir_purpose == DIR_PURPOSE_UPLOAD_VOTE ||
dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES || dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES ||