nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine 2011-09-28 15:38:02 -04:00
commit 36829539d6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug4124 Normal file
View File

@ -0,0 +1,6 @@
o Security fixes:
- Bridges relays now build circuits for themselves in a more similar
way to how clients build them. Removes another avenue for
enumerating bridges. Fixes bug 4124; bugfix on 0.2.0.3-alpha,
when bridges were introduced.

5
src/or/circuitbuild.c
View File

@ -1982,9 +1982,10 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ)
return 1; /* our hand is forced: only a create_fast will work. */ return 1; /* our hand is forced: only a create_fast will work. */
if (!options->FastFirstHopPK) if (!options->FastFirstHopPK)
return 0; /* we prefer to avoid create_fast */ return 0; /* we prefer to avoid create_fast */
if (server_mode(options)) { if (public_server_mode(options)) {
/* We're a server, and we know an onion key. We can choose. /* We're a server, and we know an onion key. We can choose.
* Prefer to blend in. */ * Prefer to blend our circuit into the other circuits we are
* creating on behalf of others. */
return 0; return 0;
} }