diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-09-12 10:28:42 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-09-12 10:28:42 -0400 |
| commit | 463673f428d5313ab6bd5d96bd27551b0f6e60a7 (patch) | |
| tree | 46b18346d08c88a9575082dc0b18daddf2ac69b7 | |
| parent | 58476ea8bfbf7daf3e7871b793f4704c347e2481 (diff) | |
| parent | d6c89b1ae1b18cc3cae42638d7bbe1edd7e35715 (diff) | |
| download | tor-463673f428d5313ab6bd5d96bd27551b0f6e60a7.tar.gz tor-463673f428d5313ab6bd5d96bd27551b0f6e60a7.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8
| -rw-r--r-- | changes/bug40855 | 6 | ||||
| -rw-r--r-- | src/feature/nodelist/networkstatus.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug40855 b/changes/bug40855 new file mode 100644 index 0000000000..b455ac9a48 --- /dev/null +++ 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 index f14034c2b7..61eef5bfa5 100644 --- 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); |