[tor-commits] [torspec/master] Merge remote-tracking branch 'chelseakomlo/prop271'

[nickm at torproject.org]

commit 32ef2f38f2a6674e7502706d8f3e3d0d70c9a5fe
Merge: 6602c67 547d1f3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 16 13:11:22 2017 -0500

    Merge remote-tracking branch 'chelseakomlo/prop271'

 glossary.txt                              | 21 ++++++-
 proposals/271-another-guard-selection.txt | 98 +++++++++++++++++++++++++------
 2 files changed, 99 insertions(+), 20 deletions(-)