aboutsummaryrefslogtreecommitdiff
path: root/spec/glossary.md
diff options
context:
space:
mode:
Diffstat (limited to 'spec/glossary.md')
-rw-r--r--spec/glossary.md25
1 files changed, 20 insertions, 5 deletions
diff --git a/spec/glossary.md b/spec/glossary.md
index 476e2cd..8ea5363 100644
--- a/spec/glossary.md
+++ b/spec/glossary.md
@@ -34,6 +34,7 @@ Table of Contents
```
<a id="glossary.txt-0"></a>
+
# Preliminaries
The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL
@@ -42,20 +43,24 @@ NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and
RFC 2119.
<a id="glossary.txt-1.0"></a>
+
## Commonly used Tor configuration terms
ORPort - Onion Router Port
DirPort - Directory Port
<a id="glossary.txt-2.0"></a>
+
## Tor network components
<a id="glossary.txt-2.1"></a>
+
## Relays, aka OR (onion router)
[Style guide: prefer the term "Relay"]
<a id="glossary.txt-2.1.1"></a>
+
### Specific roles
Exit relay: The final hop in an exit circuit before traffic leaves
@@ -85,12 +90,14 @@ Each party builds a three-hop circuit, meeting at the
rendezvous point.
<a id="glossary.txt-2.2"></a>
+
## Client, aka OP (onion proxy)
[Style: the "OP" and "onion proxy" terms are deprecated.]
<a id="glossary.txt-2.3"></a>
-## Authorities:
+
+## Authorities
Directory Authority: Nine total in the Tor network, operated by
trusted individuals. Directory authorities define and serve the
@@ -109,7 +116,8 @@ the client can ask any directory cache that's listed in the directory
information it has.)
<a id="glossary.txt-2.4"></a>
-## Hidden Service:
+
+## Hidden Service
A hidden service is a server that will only accept incoming
connections via the hidden service protocol. Connection
@@ -118,7 +126,8 @@ service, allowing the hidden service to receive incoming connections,
serve content, etc, while preserving its location anonymity.
<a id="glossary.txt-2.5"></a>
-## Circuit:
+
+## Circuit
An established path through the network, where cryptographic keys
are negotiated using the ntor protocol or TAP (Tor Authentication
@@ -136,7 +145,8 @@ network. For example, a client could connect to a hidden service via
an internal circuit.
<a id="glossary.txt-2.6"></a>
-## Edge connection:
+
+## Edge connection
```text
2.7. Consensus: The state of the Tor network, published every hour,
@@ -152,9 +162,11 @@ an internal circuit.
```
<a id="glossary.txt-3.0"></a>
+
## Tor network protocols
<a id="glossary.txt-3.1"></a>
+
## Link handshake
The link handshake establishes the TLS connection over which two
@@ -163,6 +175,7 @@ authenticates the participants to each other, possibly using Tor
cells.
<a id="glossary.txt-3.2"></a>
+
## Circuit handshake
Circuit handshakes establish the hop-by-hop onion encryption
@@ -193,12 +206,15 @@ contains the first part of the TAP or ntor key establishment
handshake.
<a id="glossary.txt-3.3"></a>
+
## Hidden Service Protocol
<a id="glossary.txt-3.4"></a>
+
## Directory Protocol
<a id="glossary.txt-4.0"></a>
+
## General network definitions
Leaky Pipe Topology: The ability for the origin of a circuit to address
@@ -213,4 +229,3 @@ connection, a DNS request, or a Tor directory request.
Channel: A pairwise connection between two Tor relays, or between a
client and a relay. Circuits are multiplexed over Channels. All
channels are currently implemented as TLS connections.
-