[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/119'

[nickm at torproject.org]

commit 904430ed73dcb55c836bedfb08fa20cf9b0df5cd
Merge: f26e739 91ea21e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 11 13:11:31 2020 -0400

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

 guard-spec.txt | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)