Merge branch 'bug7814_squash'

This commit is contained in:
Nick Mathewson 2012-12-29 01:23:14 -05:00
commit 51c2dd8f89
2 changed files with 5 additions and 0 deletions

4
changes/bug7814 Normal file
View File

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

View File

@ -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;
}
}