24 Feb
2014
24 Feb
'14
6:52 p.m.
commit 8fc9da953c1f646a31c9c51243fe65f6d3b13bc5 Merge: 92cc4f9 cdbb85e Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 24 13:52:18 2014 -0500
Merge remote-tracking branch 'karsten/prop147reject'
dir-spec.txt | 7 +++++++ proposals/147-prevoting-opinions.txt | 37 +++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-)