commit ecf241e224f8be825df43e0fa6475b8689f21ebf Merge: 18fcb9a 11d0fb3 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 20 07:54:39 2018 -0500

Merge remote-tracking branch 'tor-github/pr/46'

tor-spec.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)