Merge branch 'maint-0.2.4' into release-0.2.4

changes/bug17772

@@ -0,0 +1,7 @@
+  o Major bugfixes (guard selection):
+    - Actually look at the Guard flag when selecting a new directory
+      guard. When we implemented the directory guard design, we
+      accidentally started treating all relays as if they have the Guard
+      flag during guard selection, leading to weaker anonymity and worse
+      performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
+      by Mohsen Imani.

changes/bug17781

@@ -0,0 +1,3 @@
+  o Compilation fixes:
+    - Fix a compilation warning with Clang 3.6: Do not check the
+      presence of an address which can never be NULL. Fixes bug 17781.

changes/bug17906

@@ -0,0 +1,4 @@
+  o Minor features (authorities):
+    - Update the V3 identity key for dannenberg, it was changed on
+      18 November 2015.
+      Closes task #17906. Patch by "teor".

changes/geoip-december2015

@@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
+      Country database.
+

changes/geoip-january2016

@@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2
+      Country database.
+

changes/geoip-july2015

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip and geoip6 to the July 8 2015 Maxmind GeoLite2 Country database.
+

changes/geoip-june2015

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database.
+

changes/geoip-october2015

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database.
+

changes/geoip-september2015

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip and geoip6 to the September 3 2015 Maxmind GeoLite2 Country database.
+

changes/geoip6-june2015

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.
+

src/or/config.c

@@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
       "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
       "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
     "dannenberg orport=443 no-v2 "
-      "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
+      "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
       "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
     "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "
       "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",

src/or/connection_edge.c

@@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest,
       /* we don't know the digest; have to compare addr:port */
       tor_addr_t addr;
       if (!build_state || !build_state->chosen_exit ||
-          !entry_conn->socks_request || !entry_conn->socks_request->address)
+          !entry_conn->socks_request)
         continue;
       if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 ||
           !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

src/or/routerlist.c

@@ -1537,8 +1537,14 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags)
     if ((type & MICRODESC_DIRINFO) && !is_trusted &&
         !node->rs->version_supports_microdesc_cache)
       continue;
-    if (for_guard && node->using_as_guard)
-      continue; /* Don't make the same node a guard twice. */
+    /* Don't make the same node a guard twice */
+    if (for_guard && node->using_as_guard) {
+      continue;
+    }
+    /* Ensure that a directory guard is actually a guard node. */
+    if (for_guard && !node->is_possible_guard) {
+      continue;
+    }
     if (try_excluding &&
         routerset_contains_routerstatus(options->ExcludeNodes, status,
                                         country)) {