[tor-commits] [torspec/master] Merge remote-tracking branch 'chelseakomlo/glossary-term-additions'

[nickm at torproject.org]

commit b9f3520ace8be96e63ad1e1cd1ce8ec71faa0d61
Merge: 2ffe30f f6149b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 9 08:25:55 2017 -0400

    Merge remote-tracking branch 'chelseakomlo/glossary-term-additions'

 glossary.txt | 105 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 88 insertions(+), 17 deletions(-)