commit f3c20a28ab50386064043cc31edb3b1b543d6fc6 Merge: 1499315 b0e1ddb Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 15 14:51:19 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts: src/or/circuituse.c

changes/bug11519 | 3 +++ src/or/circuituse.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc src/or/circuituse.c index 5984691,7218ecc..c2d2b2e --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1517,8 -1309,8 +1517,8 @@@ circuit_launch_by_extend_info(uint8_t p * internal circs rather than exit circs? -RD */ circ = circuit_find_to_cannibalize(purpose, extend_info, flags); if (circ) { - uint8_t old_purpose = circ->_base.purpose; - struct timeval old_timestamp_created = circ->_base.timestamp_created; + uint8_t old_purpose = circ->base_.purpose; - struct timeval old_timestamp_began; ++ struct timeval old_timestamp_began = circ->base_.timestamp_began;

log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)", build_state_get_exit_nickname(circ->build_state), purpose,