Merge commit 'origin/maint-0.2.1'

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

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

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

diff --cc src/or/circuituse.c
index 1dd15d6af97dfb463af7e32cd2f01fec44428b14,bb19175a766a41f0addb7b880cf44f430d79d3e5..92e0746369313e2f52eab9be4cbba9e0a488e02d
--- 1/src/or/circuituse.c
--- 2/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@@ -1108,9 -1108,14 +1108,9 @@@ circuit_get_open_circ_or_launch(edge_co
        extend_info = rend_client_get_random_intro(conn->rend_data);
        if (!extend_info) {
          log_info(LD_REND,
-                  "No intro points for '%s': refetching service descriptor.",
+                  "No intro points for '%s': re-fetching service descriptor.",
                   safe_str(conn->rend_data->onion_address));
 -        /* Fetch both, v0 and v2 rend descriptors in parallel. Use whichever
 -         * arrives first. Exception: When using client authorization, only
 -         * fetch v2 descriptors.*/
          rend_client_refetch_v2_renddesc(conn->rend_data);
 -        if (conn->rend_data->auth_type == REND_NO_AUTH)
 -          rend_client_refetch_renddesc(conn->rend_data->onion_address);
          conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;
          return 0;
        }

diff --cc src/or/config.c
index 70ad1b55cdcfda566cbc127a5b34a7580e8b7b8e,963ee10c5a75c5e0e093370d4e1b13f590050a65..eaa875043efd88efbc9de54481ef4922a3521db7
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -1285,9 -1285,9 +1285,9 @@@ options_act(or_options_t *old_options
      finish_daemon(options->DataDirectory);
    }
  
-   /* Write our pid to the pid file. If we do not have write permissions we
+   /* Write our PID to the PID file. If we do not have write permissions we
     * will log a warning */
 -  if (running_tor && options->PidFile)
 +  if (options->PidFile)
      write_pidfile(options->PidFile);
  
    /* Register addressmap directives */

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

diff --cc src/or/connection_edge.c
index eff20bd139acfde4bff01fe05e04b6aa31d37036,9b1f737917343f637c652f438c46570703e025d2..6207ad31789b2cb34ea255afdf8341313d5228ef
--- 1/src/or/connection_edge.c
--- 2/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@@ -1691,9 -1696,14 +1691,9 @@@ connection_ap_handshake_rewrite_and_att
          }
        } else {
          conn->_base.state = AP_CONN_STATE_RENDDESC_WAIT;
-         log_info(LD_REND, "Stale descriptor %s. Refetching.",
+         log_info(LD_REND, "Stale descriptor %s. Re-fetching.",
                   safe_str(conn->rend_data->onion_address));
 -        /* Fetch both, v0 and v2 rend descriptors in parallel. Use whichever
 -         * arrives first. Exception: When using client authorization, only
 -         * fetch v2 descriptors.*/
          rend_client_refetch_v2_renddesc(conn->rend_data);
 -        if (conn->rend_data->auth_type == REND_NO_AUTH)
 -          rend_client_refetch_renddesc(conn->rend_data->onion_address);
        }
      }
      return 0;

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

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

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

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

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

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

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

diff --cc src/or/rendclient.c
index 3be67c9f839667e1b2f76ae89dc166e1040be498,784db9dadf09b188eb4a3b72df21cd3c74a3ec03..fb50e8dc0094728e04e5dbf92739bdb13e813baa
--- 1/src/or/rendclient.c
--- 2/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@@ -80,19 -80,23 +80,23 @@@ rend_client_send_introduction(origin_ci
      goto err;
    }
  
-   /* first 20 bytes of payload are the hash of the intro key */
-   intro_key = NULL;
-   SMARTLIST_FOREACH(entry->parsed->intro_nodes, rend_intro_point_t *,
-                     intro, {
-     if (!memcmp(introcirc->build_state->chosen_exit->identity_digest,
-                 intro->extend_info->identity_digest, DIGEST_LEN)) {
-       intro_key = intro->intro_key;
-       break;
 -  /* first 20 bytes of payload are the hash of Bob's pk */
 -  if (entry->parsed->version == 0) { /* un-versioned descriptor */
++  /* first 20 bytes of payload are the hash of bob's pk */
++  if (entry->parsed->version == 0) { /* unversioned descriptor */
+     intro_key = entry->parsed->pk;
+   } else { /* versioned descriptor */
+     intro_key = NULL;
+     SMARTLIST_FOREACH(entry->parsed->intro_nodes, rend_intro_point_t *,
+                       intro, {
+       if (!memcmp(introcirc->build_state->chosen_exit->identity_digest,
+                   intro->extend_info->identity_digest, DIGEST_LEN)) {
+         intro_key = intro->intro_key;
+         break;
+       }
+     });
+     if (!intro_key) {
+       log_warn(LD_BUG, "Internal error: could not find intro key.");
+       goto err;
      }
-   });
-   if (!intro_key) {
-     log_warn(LD_BUG, "Internal error: could not find intro key.");
-     goto err;
    }
    if (crypto_pk_get_digest(intro_key, payload)<0) {
      log_warn(LD_BUG, "Internal error: couldn't hash public key.");

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

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

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