Merge branch 'maint-0.3.1'

Resolve conflict with 23532 code.

changes/bug23533

+  o Minor bugfixes (relay):
+    - Inform the geoip and rephist modules about all requests, even
+      on relays that are only fetching microdescriptors. Fixes a bug related
+      to 21585; bugfix on 0.3.0.1-alpha.

src/or/channel.c

@@ -2715,7 +2715,7 @@ channel_do_open_actions(channel_t *chan)
     router_set_status(chan->identity_digest, 1);
   } else {
     /* only report it to the geoip module if it's not a known router */
-    if (!router_get_by_id_digest(chan->identity_digest)) {
+    if (!connection_or_digest_is_known_relay(chan->identity_digest)) {
       if (channel_get_addr_if_possible(chan, &remote_addr)) {
         char *transport_name = NULL;
         if (chan->get_transport_name(chan, &transport_name) < 0)

src/or/channeltls.c

@@ -1828,8 +1828,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
 #define NETINFO_NOTICE_SKEW 3600
   if (labs(apparent_skew) > NETINFO_NOTICE_SKEW &&
       (started_here ||
-       connection_or_digest_is_known_relay(identity_digest))) {
-    int trusted = router_digest_is_trusted_dir(identity_digest);
+       connection_or_digest_is_known_relay(chan->conn->identity_digest))) {
+    int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest);
     clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL,
                        "NETINFO cell", "OR");
   }

src/or/rephist.c

@@ -947,9 +947,9 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down)
     base16_encode(dbuf, sizeof(dbuf), digest, DIGEST_LEN);
 
     if (missing_means_down && hist->start_of_run &&
-        !router_get_by_id_digest(digest)) {
+        !connection_or_digest_is_known_relay(digest)) {
       /* We think this relay is running, but it's not listed in our
-       * routerlist. Somehow it fell out without telling us it went
+       * consensus. Somehow it fell out without telling us it went
        * down. Complain and also correct it. */
       log_info(LD_HIST,
                "Relay '%s' is listed as up in rephist, but it's not in "