tor

commit 2cecf046bbbb4bfef045c7233966e2f429c32145
parent 449f988c8f5e610b2a030a0c2577afd4bb74dc4a
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 12 Sep 2023 10:28:42 -0400

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/bug40855
 | 
6
++++++
M
src/feature/nodelist/networkstatus.c
 | 
4
+++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/bug40855 b/changes/bug40855
@@ -0,0 +1,6 @@
+  o Minor bugfixes (bridge authority):
+    - When reporting a pseudo-networkstatus as a bridge authority,
+      or answering "ns/purpose/*" controller requests,
+      include accurate published-on dates from our
+      list of router descriptors.  Fixes bug 40855;
+      bugfix on 0.4.8.1-alpha.
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
@@ -2451,7 +2451,9 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now)
     if (ri->purpose != purpose)
       continue;
     set_routerstatus_from_routerinfo(&rs, node, ri);
-    smartlist_add(statuses, networkstatus_getinfo_helper_single(&rs));
+    char *text = routerstatus_format_entry(
+      &rs, NULL, NULL, NS_CONTROL_PORT, NULL, ri->cache_info.published_on);
+    smartlist_add(statuses, text);
   } SMARTLIST_FOREACH_END(ri);
 
   answer = smartlist_join_strings(statuses, "", 0, NULL);