[tor-commits] [tor/master] Merge branch 'feature3457-v4-nm-squashed'

[nickm at torproject.org]

commit f729e1e984896a9d6852768a8e5528932f668ac3
Merge: f371816 b5af456
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 12:10:14 2012 -0500

    Merge branch 'feature3457-v4-nm-squashed'
    
    Conflicts:
    	src/or/rendclient.c

 changes/feature3457  |   12 +++++
 src/common/util.c    |   20 ++++++++
 src/common/util.h    |    3 +
 src/or/circuituse.c  |   48 +++++++++++++++++++-
 src/or/circuituse.h  |    2 +
 src/or/control.c     |  123 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/or/control.h     |    5 ++
 src/or/or.h          |    7 +++
 src/or/rendclient.c  |   15 ++++---
 src/or/rendmid.c     |   10 +++--
 src/or/rendservice.c |    6 +-
 src/test/test_util.c |   21 ++++++++-
 12 files changed, 250 insertions(+), 22 deletions(-)

diff --cc src/or/rendclient.c
index dff8bc3,dfb52d4..1acc9ea
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@@ -350,12 -341,12 +351,13 @@@ rend_client_introduction_acked(origin_c
       * and tell it.
       */
      log_info(LD_REND,"Received ack. Telling rend circ...");
 -    rendcirc = circuit_get_by_rend_query_and_purpose(
 -               circ->rend_data->onion_address, CIRCUIT_PURPOSE_C_REND_READY);
 +    rendcirc = circuit_get_ready_rend_circ_by_rend_data(circ->rend_data);
      if (rendcirc) { /* remember the ack */
 +#ifndef NON_ANONYMOUS_MODE_ENABLED
        tor_assert(!(rendcirc->build_state->onehop_tunnel));
 +#endif
-       rendcirc->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED;
+       circuit_change_purpose(TO_CIRCUIT(rendcirc),
+                              CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED);
        /* Set timestamp_dirty, because circuit_expire_building expects
         * it to specify when a circuit entered the
         * _C_REND_READY_INTRO_ACKED state. */