Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

diff --cc src/common/crypto.c
index 1d12a9d32d0433f33f6604404b488fd8c513d77e,29137a834dd2c9a5918d24b5cfb19303193c961c..e847d8c03339662e8bf09750780d75a576e4dc5f
--- 1/src/common/crypto.c
--- 2/src/common/crypto.c
+++ b/src/common/crypto.c
@@@ -1877,12 -1699,13 +1879,13 @@@ crypto_dh_compute_secret(int severity, 
    if (!(pubkey_bn = BN_bin2bn((const unsigned char*)pubkey,
                                (int)pubkey_len, NULL)))
      goto error;
 -  if (tor_check_dh_key(pubkey_bn)<0) {
 +  if (tor_check_dh_key(severity, pubkey_bn)<0) {
      /* Check for invalid public keys. */
 -    log_warn(LD_CRYPTO,"Rejected invalid g^x");
 +    log_fn(severity, LD_CRYPTO,"Rejected invalid g^x");
      goto error;
    }
-   secret_tmp = tor_malloc(crypto_dh_get_bytes(dh));
+   secret_tmp_len = crypto_dh_get_bytes(dh);
+   secret_tmp = tor_malloc(secret_tmp_len);
    result = DH_compute_key((unsigned char*)secret_tmp, pubkey_bn, dh->dh);
    if (result < 0) {
      log_warn(LD_CRYPTO,"DH_compute_key() failed.");

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

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