diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-29 01:23:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-29 01:23:14 -0500 |
| commit | 51c2dd8f8954d52fbaef29d2afb44d5eda47f4da (patch) | |
| tree | d0cc6fd6b1923c12cee244a091f4feecd9798d24 | |
| parent | 127cb39ffcacbcd99633671e92d299ef53bbac46 (diff) | |
| parent | 5e22cfe2b40eab8c754a9c7622a1f5a85d202641 (diff) | |
| download | tor-51c2dd8f8954d52fbaef29d2afb44d5eda47f4da.tar tor-51c2dd8f8954d52fbaef29d2afb44d5eda47f4da.tar.gz | |
Merge branch 'bug7814_squash'
| -rw-r--r-- | changes/bug7814 | 4 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug7814 b/changes/bug7814 new file mode 100644 index 000000000..7ecc2427a --- /dev/null +++ b/changes/bug7814 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid crashing when, as a node without IPv6-exit support, a + client insists on getting an IPv6 address or nothing. Fixes bug + #7814; bugfix on 0.2.4.7-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index defe94408..a0ebfd139 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2427,6 +2427,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) tor_free(address); relay_send_end_cell_from_edge(rh.stream_id, circ, END_STREAM_REASON_EXITPOLICY, NULL); + return 0; } } |