Merge branch 'feature3457-v4-nm-squashed'

Conflicts:
	src/or/rendclient.c

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/circuituse.h
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/rendclient.c
index dff8bc33a8f6075c326fc9187e277e9adadc11e2,dfb52d49a9e65ff4f450143d5fef9db82b8938ca..1acc9eaa8d24fdf3e31292ab307dd52df9ad3af0
--- 1/src/or/rendclient.c
--- 2/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));
-       rendcirc->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED;
 +#endif
+       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. */

diff --cc src/or/rendservice.c
Simple merge

diff --cc src/test/test_util.c
Simple merge