commit e7d32b985c2684e1d5983911ad98217e8808caf6 Merge: f930be3 41082ff Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 13 13:12:13 2016 -0500 Merge remote-tracking branch 'public/prop271-changes' proposals/271-another-guard-selection.txt | 143 ++++++++++++++++++++++++------ 1 file changed, 116 insertions(+), 27 deletions(-)