Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
	src/or/routerlist.h

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

diff --cc src/or/routerlist.c
index cb39729ff549107514482e45458272621cc3c0d3,a7968beca29965f0b48ff3b53d80e32d847c5337..b49dc1ac0b8268f14d0e25bc8f540f9e1e3b6cf4
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -600,39 -455,42 +600,72 @@@ authority_cert_dl_failed(const char *id
        !(cl = digestmap_get(trusted_dir_certs, id_digest)))
      return;
  
 -  download_status_failed(&cl->dl_status, status);
 +  /*
 +   * Are we noting a failed download of the latest cert for the id digest,
 +   * or of a download by (id, signing key) digest pair?
 +   */
 +  if (!signing_key_digest) {
 +    /* Just by id digest */
 +    download_status_failed(&cl->dl_status_by_id, status);
 +  } else {
 +    /* Reset by (id, signing key) digest pair
 +     *
 +     * Look for a download_status_t in the map with this digest
 +     */
 +    dlstatus = dsmap_get(cl->dl_status_map, signing_key_digest);
 +    /* Got one? */
 +    if (dlstatus) {
 +      download_status_failed(dlstatus, status);
 +    } else {
 +      /*
 +       * Do this rather than hex_str(), since hex_str clobbers
 +       * old results and we call twice in the param list.
 +       */
 +      base16_encode(id_digest_str, sizeof(id_digest_str),
 +                    id_digest, DIGEST_LEN);
 +      base16_encode(sk_digest_str, sizeof(sk_digest_str),
 +                    signing_key_digest, DIGEST_LEN);
 +      log_warn(LD_BUG,
 +               "Got failure for cert fetch with (fp,sk) = (%s,%s), with "
 +               "status %d, but knew nothing about the download.",
 +               id_digest_str, sk_digest_str, status);
 +    }
 +  }
  }
  
+ static const char *BAD_SIGNING_KEYS[] = {
+   "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31
+ // dizum still needs to rotate as of 2014-04-14
+ //"0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26
+ // dannenberg still needs to rotate as of 2014-04-14
+ //"57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09
+   "87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09
+   "98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56
+   "9904B52336713A5ADCB13E4FB14DC919E0D45571", // Expires 2014-04-20 20:01:01
+   "9DCD8E3F1DD1597E2AD476BBA28A1A89F3095227", // Expires 2015-01-16 03:52:30
+   "A61682F34B9BB9694AC98491FE1ABBFE61923941", // Expires 2014-06-11 09:25:09
+   "B59F6E99C575113650C99F1C425BA7B20A8C071D", // Expires 2014-07-31 13:22:10
+   "D27178388FA75B96D37FA36E0B015227DDDBDA51", // Expires 2014-08-04 04:01:57
+   NULL,
+ };
+ 
+ /** DOCDOC */
+ int
+ authority_cert_is_blacklisted(const authority_cert_t *cert)
+ {
+   char hex_digest[HEX_DIGEST_LEN+1];
+   int i;
+   base16_encode(hex_digest, sizeof(hex_digest),
+                 cert->signing_key_digest, sizeof(cert->signing_key_digest));
+ 
+   for (i = 0; BAD_SIGNING_KEYS[i]; ++i) {
+     if (!strcasecmp(hex_digest, BAD_SIGNING_KEYS[i])) {
+       return 1;
+     }
+   }
+   return 0;
+ }
+ 
  /** Return true iff when we've been getting enough failures when trying to
   * download the certificate with ID digest <b>id_digest</b> that we're willing
   * to start bugging the user about it. */

diff --cc src/or/routerlist.h
index ce0f0f2e34bfcb8a2c98c0823c2bb5d955076dd4,bd55b7b20159a6c85779d31a2cb17d96e48d7b58..505685897fa1bc4a3a06cf08e6da380fb6f115b8
--- 1/src/or/routerlist.h
--- 2/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@@ -39,8 -25,8 +39,9 @@@ void authority_cert_dl_failed(const cha
  void authority_certs_fetch_missing(networkstatus_t *status, time_t now);
  int router_reload_router_list(void);
  int authority_cert_dl_looks_uncertain(const char *id_digest);
 -smartlist_t *router_get_trusted_dir_servers(void);
 +const smartlist_t *router_get_trusted_dir_servers(void);
 +const smartlist_t *router_get_fallback_dir_servers(void);
+ int authority_cert_is_blacklisted(const authority_cert_t *cert);
  
  const routerstatus_t *router_pick_directory_server(dirinfo_type_t type,
                                                     int flags);

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