Merge branch 'master' into review

Conflicts:
	src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java

Author: str4d

src/net/i2p/crypto/eddsa/math/Encoding.java

@@ -9,7 +9,9 @@
 public abstract class Encoding {
     protected Field f;
 
-    public void setField(Field f) {
+    public synchronized void setField(Field f) {
+        if (this.f != null)
+            throw new IllegalStateException("already set");
         this.f = f;
     }