Merge branch 'maint-0.4.8'

This commit is contained in:
David Goulet 2023-09-12 10:28:42 -04:00
commit 2cecf046bb
2 changed files with 9 additions and 1 deletions

6
changes/bug40855 Normal file
View File

@ -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.

View File

@ -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);