commit 79b1f8f47e7f47f7b9a2603a5aeead53404a1480 Author: Roger Dingledine arma@torproject.org Date: Mon Aug 13 16:11:19 2012 -0400

add notes from other things that should be glossarized --- glossary.txt | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/glossary.txt b/glossary.txt index c3fbf74..7fcd4fa 100644 --- a/glossary.txt +++ b/glossary.txt @@ -3,8 +3,8 @@

The Tor Project

-Note: This document aims to specify terms, notations or phrases related to Tor and The -Tor Project. +Note: This document aims to specify terms, notations or phrases related +to Tor and The Tor Project.

This glossary is not a design document; it is only a reference.

@@ -20,3 +20,22 @@ This glossary is not a design document; it is only a reference. ORPort - Onion Router Port DirPort - Directory Port

+0.2 Tor network components + + Relay, aka OR (onion router) - + Exit relay + Non-exit relay + Guard relay + Client, aka OP (onion proxy) + + Bridge - + Circuit - + Stream + Edge connection: + + TLS connection: + + Link handshake + Circuit handshake + +