[tor-commits] [torspec/master] Merge branch 'feature21242'

[nickm at torproject.org]

commit 7cbcbf5bcbac29d0f2acb6c65ea2c5eb12937ea0
Merge: ee2a7f8 b729833
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 09:15:33 2017 -0500

    Merge branch 'feature21242'

 guard-spec.txt | 22 ++++++++++++++++++++--
 path-spec.txt  | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)