Merge branch 'maint-0.4.5' into release-0.4.5

This commit is contained in:
Alexander Færøy
2021-10-20 21:47:26 +00:00
3 changed files with 28 additions and 0 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor features (bridge):
- We now announce the URL to Tor's new bridge status at
https://bridges.torproject.org/ when Tor is configured to run as a bridge
relay. Closes ticket 30477.
+23
View File
@@ -843,6 +843,25 @@ router_initialize_tls_context(void)
(unsigned int)lifetime);
}
/** Announce URL to bridge status page. */
STATIC void
router_announce_bridge_status_page(void)
{
char fingerprint[FINGERPRINT_LEN + 1];
if (crypto_pk_get_hashed_fingerprint(get_server_identity_key(),
fingerprint) < 0) {
// LCOV_EXCL_START
log_err(LD_GENERAL, "Unable to compute bridge fingerprint");
return;
// LCOV_EXCL_STOP
}
log_notice(LD_GENERAL, "You can check the status of your bridge relay at "
"https://bridges.torproject.org/status?id=%s",
fingerprint);
}
/** Compute fingerprint (or hashed fingerprint if hashed is 1) and write
* it to 'fingerprint' (or 'hashed-fingerprint'). Return 0 on success, or
* -1 if Tor should die,
@@ -1145,6 +1164,10 @@ init_keys(void)
return -1;
}
/* Display URL to bridge status page. */
if (! public_server_mode(options))
router_announce_bridge_status_page();
if (!authdir_mode(options))
return 0;
/* 6. [authdirserver only] load approved-routers file */
+1
View File
@@ -129,6 +129,7 @@ void router_free_all(void);
STATIC void get_platform_str(char *platform, size_t len);
STATIC int router_write_fingerprint(int hashed, int ed25519_identity);
STATIC smartlist_t *get_my_declared_family(const or_options_t *options);
STATIC void router_announce_bridge_status_page(void);
STATIC int load_stats_file(const char *filename, const char *ts_tag,
time_t now, char **out);