commit 2f775a13e4b66a8984dfd721194f81ef363f2e38 Merge: 57abce5 3673092 Author: Isis Lovecruft <isis@torproject.org> Date: Sun Nov 1 23:38:43 2015 +0000 Merge branch 'prop259-typos' proposals/259-guard-selection.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)