commit 54e352497d08eb55bcce1f81e7b12a6e66e99957 Merge: 78de0f9 c91b4cc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Apr 23 14:19:18 2014 -0400 Merge remote-tracking branch 'asn/single_guard' proposals/xxx-single-guard-node.txt | 286 +++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+)