Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/snark/AUTHORS
+++ b/src/snark/AUTHORS
@@ -0,0 +1,19 @@
+SCIPR Lab:
+    Eli Ben-Sasson
+    Alessandro Chiesa
+    Daniel Genkin
+    Shaul Kfir
+    Eran Tromer
+    Madars Virza
+
+External contributors:
+    Michael Backes
+    Manuel Barbosa
+    Dario Fiore
+    Jens Groth
+    Joshua A. Kroll
+    Shigeo MITSUNARI
+    Raphael Reischuk
+    Tadanori TERUYA
+    Sean Bowe
+    Daira Hopwood