summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-05-07 08:49:34 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-05-07 08:49:34 -0400
commit7aa75d0738d78ae122eb601f8c96da5f6332c2b1 (patch)
tree3acb71fa9698e564310a582b8c34d86a65e68b6a
parent13fd8f362fe34a68466c1320329c924f6fefaa45 (diff)
parent80c404c4b79f3bcba3fc4585d4c62a62a04f3ed9 (diff)
downloadtor-7aa75d0738d78ae122eb601f8c96da5f6332c2b1.tar.gz
tor-7aa75d0738d78ae122eb601f8c96da5f6332c2b1.zip
Merge branch 'maint-0.4.5' into release-0.4.5
-rw-r--r--changes/ticket403733
-rw-r--r--src/core/or/connection_edge.c10
2 files changed, 13 insertions, 0 deletions
diff --git a/changes/ticket40373 b/changes/ticket40373
new file mode 100644
index 0000000000..e2ea297bc2
--- /dev/null
+++ b/changes/ticket40373
@@ -0,0 +1,3 @@
+ o Minor features (onion services):
+ - Add warning message when connecting to soon-to-be-deprecated v2 onions.
+ Closes ticket 40373.
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index a33c64fe19..7f260ba185 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -2582,6 +2582,16 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
tor_assert(addresstype == ONION_V2_HOSTNAME ||
addresstype == ONION_V3_HOSTNAME);
tor_assert(!automap);
+
+ if (addresstype == ONION_V2_HOSTNAME) {
+ log_warn(LD_PROTOCOL,
+ "Warning! You've just connected to a v2 onion address. These "
+ "addresses are deprecated for security reasons, and are no "
+ "longer supported in Tor. Please encourage the site operator "
+ "to upgrade. For more information see "
+ "https://blog.torproject.org/v2-deprecation-timeline");
+ }
+
return connection_ap_handle_onion(conn, socks, circ, addresstype);
}