aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--address-spec.txt2
-rw-r--r--dir-spec.txt2
-rw-r--r--tor-spec.txt3
3 files changed, 3 insertions, 4 deletions
diff --git a/address-spec.txt b/address-spec.txt
index 98e7068..1e90e6e 100644
--- a/address-spec.txt
+++ b/address-spec.txt
@@ -1,4 +1,3 @@
-
Special Hostnames in Tor
Nick Mathewson
@@ -71,6 +70,7 @@ Table of Contents
- PUBKEY is the 32 bytes ed25519 master pubkey of the onion service.
- VERSION is a one byte version field (default value '\x03')
- ".onion checksum" is a constant string
+ - H is SHA3-256
- CHECKSUM is truncated to two bytes before inserting it in onion_address
When Tor sees an address in this format, it tries to look up and connect to
diff --git a/dir-spec.txt b/dir-spec.txt
index b6a7c8e..d6b58cd 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1032,7 +1032,7 @@ Table of Contents
statistics.
"geoip-start-time" and "geoip-client-origins" have been replaced by
- "bridge-stats-end" and "bridge-stats-ips" in 0.2.2.4-alpha. The
+ "bridge-stats-end" and "bridge-ips" in 0.2.2.4-alpha. The
reason is that the measurement interval with "geoip-stats" as
determined by subtracting "geoip-start-time" from "published" could
have had a variable length, whereas the measurement interval in
diff --git a/tor-spec.txt b/tor-spec.txt
index 8f30624..b03d3f5 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -1260,13 +1260,12 @@ see tor-design.pdf.
t_mac = PROTOID | ":mac"
t_key = PROTOID | ":key_extract"
t_verify = PROTOID | ":verify"
- MULT(a,b) = the multiplication of the curve25519 point 'a' by the
- scalar 'b'.
G = The preferred base point for curve25519 ([9])
KEYGEN() = The curve25519 key generation algorithm, returning
a private/public keypair.
m_expand = PROTOID | ":key_expand"
KEYID(A) = A
+ EXP(a, b) = The ECDH algorithm for establishing a shared secret.
To perform the handshake, the client needs to know an identity key
digest for the server, and an ntor onion key (a curve25519 public