[tor-commits] [torspec/master] Merge commit '8692de910d'

[nickm at torproject.org]

commit e2d585a243ecb4f4042f4968d079b00d7dbe4afa
Merge: 8bc8bf0 8692de9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 12 10:05:01 2018 -0500

    Merge commit '8692de910d'

 tor-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)