commit 071753ad14e9fd2949e094b6956dbeae79655eb7 Merge: 64d80bb c9a9acb Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 29 17:08:44 2015 -0400

Merge remote-tracking branch 'isis/bug17261-best-guess'

proposals/xxx-guard-selection.txt | 303 +++++++++++++++++++++++++++++++++++++ 1 file changed, 303 insertions(+)