From 79b1f8f47e7f47f7b9a2603a5aeead53404a1480 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 13 Aug 2012 16:11:19 -0400
Subject: add notes from other things that should be glossarized

---
 glossary.txt | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'glossary.txt')

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
+
+
-- 
cgit v1.2.3-54-g00ecf