Merge remote-tracking branch 'benadida/master' into django-1.11

helios/views.py

@@ -1205,7 +1205,7 @@ def voters_list_pretty(request, election):
     return user_reauth(request, user)
   
   # files being processed
-  voter_files = election.voterfile_set.all()
+  voter_files = election.voterfile_set.all().order_by('-uploaded_at')
 
   # load a bunch of voters
   # voters = Voter.get_by_election(election, order_by=order_by)

heliosbooth/js/jscrypto/random.js

@@ -26,10 +26,9 @@ Random.getRandomInteger = function(max) {
   var bit_length = max.bitLength();
   Random.setupGenerator();
   var random;
-  random = sjcl.random.randomWords(Math.ceil(bit_length / 32)+2, 0);
+  random = sjcl.random.randomWords(Math.ceil(bit_length / 32) + 2, 6);
   // we get a bit array instead of a BigInteger in this case
   var rand_bi = new BigInt(sjcl.codec.hex.fromBits(random), 16);
   return rand_bi.mod(max);
-  return BigInt._from_java_object(random).mod(max);
 };