diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-09-28 15:38:02 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-09-28 15:38:02 -0400 |
| commit | 36829539d64dab47e07bd619b7b833ef50d26853 (patch) | |
| tree | 44a67f35389a314cf429cd16525220b72de04883 | |
| parent | 4e88a3bc3e1a195864c3185d16d89e090246fc55 (diff) | |
| parent | ff8aba7053728d5b8f51152e10d73a7535e495a3 (diff) | |
| download | tor-36829539d64dab47e07bd619b7b833ef50d26853.tar.gz tor-36829539d64dab47e07bd619b7b833ef50d26853.zip | |
Merge branch 'maint-0.2.2'
| -rw-r--r-- | changes/bug4124 | 6 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/changes/bug4124 b/changes/bug4124 new file mode 100644 index 0000000000..abe93ccdd8 --- /dev/null +++ b/changes/bug4124 @@ -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. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 08a1f6fa15..36f7dad1bc 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -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. */ if (!options->FastFirstHopPK) 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. - * Prefer to blend in. */ + * Prefer to blend our circuit into the other circuits we are + * creating on behalf of others. */ return 0; } |