merge of 'b68ae0177d4f3bd3ac8cedcb6fbf7aa9e3db6cb8'

and 'cf9e5b3c6634546f3b46b25e53ac47dcedde73b4'

core/build.gradle

@@ -27,6 +27,7 @@ sourceSets {
         }
         resources {
             srcDir 'java/test/junit'
+            include 'resources/*'
             include 'net/i2p/crypto/eddsa/test.data'
             include 'net/i2p/crypto/eddsa/math/baseDblPrecmp'
             include 'net/i2p/crypto/eddsa/math/basePrecmp'

core/java/src/net/i2p/crypto/SU3File.java

@@ -700,7 +700,7 @@ public class SU3File {
     }
 
     /**
-     *  @param stype number or name
+     *  @param ctype number or name
      *  @return null if not found
      *  @since 0.9.9
      */