commit 2223efd9e717f30b9a04079e8a5f9af88bbd6d19 Merge: 39fde37 e4b7001 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 13 09:01:10 2018 -0500

Merge remote-tracking branch 'atagar/recognized'

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