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

Conflicts:
	src/or/circuituse.c

diff --cc src/or/circuituse.c
index 5984691989e4c6ddeaedb270680bd5b8593aeba1,7218ecc0774abcc41888aae9b63c132e67afc9c3..c2d2b2e87ca09c63835922c7dc3a4e2eba9438a3
--- 1/src/or/circuituse.c
--- 2/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,