[tor-commits] [torspec/master] Merge remote-tracking branch 'argonblue/glossary'

[nickm at torproject.org]

commit 1d4e05b9626e4554606b90e83301a71d199c1295
Merge: c71d8c9 6049c95
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 22 08:39:38 2017 -0400

    Merge remote-tracking branch 'argonblue/glossary'

 glossary.txt | 44 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)