commit 6523ac863123a1cee8e17b7878a80edce5fca28c Merge: c815aad dc7bddf Author: Nick Mathewson nickm@torproject.org Date: Fri May 19 16:11:48 2017 -0400

Merge remote-tracking branch 'asn/guard_spec_roger'

guard-spec.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)