Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/rendservice.c

Conflicts were due to new NON_ANONYMOUS_MODE_ENABLED tor2web code; I
think I resolved them correctly.

diff --cc src/or/rendservice.c
index 30b0d88af6fed0ce295501d61d91e0e87303485c,a1daa8a550360f925c3333ed920568f8d0108ac4..44e669701884fb794b87972d0cdfbcd557f34fa0
--- 1/src/or/rendservice.c
--- 2/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@@ -1062,11 -907,15 +1062,18 @@@ rend_service_introduce(origin_circuit_
    time_t now = time(NULL);
    char diffie_hellman_hash[DIGEST_LEN];
    time_t *access_time;
 -  or_options_t *options = get_options();
 +  const or_options_t *options = get_options();
  
+   if (circuit->_base.purpose != CIRCUIT_PURPOSE_S_INTRO) {
+     log_warn(LD_PROTOCOL,
+              "Got an INTRODUCE2 over a non-introduction circuit %d.",
+              circuit->_base.n_circ_id);
+     return -1;
+   }
+ 
 +#ifndef NON_ANONYMOUS_MODE_ENABLED
 +  tor_assert(!(circuit->build_state->onehop_tunnel));
 +#endif
    tor_assert(circuit->rend_data);
  
    base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1,