diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-14 16:34:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-14 16:34:33 -0400 |
| commit | e91a8c5589be1f562563a73c6e866a3b84afee87 (patch) | |
| tree | 98df41dbc7dfe797cf47c583c6869c8e7decdc0d /changes | |
| parent | f1c365b032e058e7342b632006435ecc175475a3 (diff) | |
| parent | 0588330c1d66960353c412812d1d073fdb37e310 (diff) | |
| download | tor-e91a8c5589be1f562563a73c6e866a3b84afee87.tar tor-e91a8c5589be1f562563a73c6e866a3b84afee87.tar.gz | |
Merge remote branch 'origin/maint-0.2.2'
Resolved nontrivial conflict around rewrite_x_address_for_bridge and
learned_bridge_descriptor. Now, since leanred_bridge_descriptor works
on nodes, we must make sure that rewrite_node_address_for_bridge also
works on nodes.
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug2510 | 8 | ||||
| -rw-r--r-- | changes/bug2511 | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug2510 b/changes/bug2510 new file mode 100644 index 000000000..2c3f61355 --- /dev/null +++ b/changes/bug2510 @@ -0,0 +1,8 @@ + o Major bugfixes: + - Fix a bug where bridge users who configure the non-canonical + address of a bridge automatically switch to its canonical + address. If a bridge listens at more than one address, it should be + able to advertise those addresses independently and any non-blocked + addresses should continue to work. Bugfix on Tor 0.2.0.x. Fixes + bug 2510. + diff --git a/changes/bug2511 b/changes/bug2511 new file mode 100644 index 000000000..a27696a5f --- /dev/null +++ b/changes/bug2511 @@ -0,0 +1,6 @@ + o Major bugfixes: + - If you configured Tor to use bridge A, and then quit and + configured Tor to use bridge B instead, it would happily continue + to use bridge A if it's still reachable. While this behavior is + a feature if your goal is connectivity, in some scenarios it's a + dangerous bug. Bugfix on Tor 0.2.0.1-alpha; fixes bug 2511. |