commit 26fb675bcabb89e75dd6ca76fec876e35ddb8370 Merge: f0aa17a 0db4bd5 Author: Nick Mathewson <[email protected]> Date: Mon Jan 6 12:26:38 2014 -0500
Merge remote-tracking branch 'karsten/prop165tweaks'
proposals/165-simple-robust-voting.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
