From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Apr 2014 18:51:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
X-Git-Tag: tor-0.2.5.4-alpha~50^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3c20a28ab50386064043cc31edb3b1b543d6fc6;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/circuituse.c
---

f3c20a28ab50386064043cc31edb3b1b543d6fc6
diff --cc src/or/circuituse.c
index 5984691989,7218ecc077..c2d2b2e87c
--- 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,