diff --git a/history.txt b/history.txt
index 070e793fc..20f5d1342 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2016-12-05 zzz
+ * Router:
+ - Revert default family sig type back to ECDSA
+ - Update blocklist
+
+2016-12-02 zzz
+ * Cleanup: Single char indexOf()
+ * Console: Version the css links
+
2016-12-01 zzz
* NetDb: Peer selection tweaks
diff --git a/installer/resources/blocklist.txt b/installer/resources/blocklist.txt
index 74e7e01ff..308e61a3a 100644
--- a/installer/resources/blocklist.txt
+++ b/installer/resources/blocklist.txt
@@ -72,3 +72,17 @@ Friend of the Chinese Floodfill Flooder:159.226.40.3
The Team Cymru Bogon List v6.8 03 FEB 2011:198.51.100.0/24
The Team Cymru Bogon List v6.8 03 FEB 2011:203.0.113.0/24
The Team Cymru Bogon List v6.8 03 FEB 2011:224.0.0.0/3
+Sybil:45.32.60.71
+Sybil:45.76.129.193
+Sybil:47.88.6.66
+Sybil:47.88.7.8
+Sybil:47.88.136.46
+Sybil:47.88.136.86
+Sybil:47.88.138.200
+Sybil:47.89.38.177
+Sybil:47.90.1.15
+Sybil:47.90.1.26
+Sybil:150.95.128.165
+Sybil:2001;19f0;7001;d99;5400;ff;fe41;829c
+Sybil:2001;19f0;7402;24d;5400;ff;fe41;9153
+Sybil:2400;8500;1302;816;a150;95;128;165b
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 59b43357e..affa6f41b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 13;
+ public final static long BUILD = 14;
/** for example "-test" */
public final static String EXTRA = "-rc";
diff --git a/router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java b/router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java
index 7f0c2962d..8cc288fa8 100644
--- a/router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java
+++ b/router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java
@@ -62,10 +62,10 @@ public class FamilyKeyCrypto {
private static final int DEFAULT_KEY_VALID_DAYS = 3652; // 10 years
// Note that we can't use RSA here, as the b64 sig would exceed the 255 char limit for a Mapping
// Note that we can't use EdDSA here, as keystore doesn't know how, and encoding/decoding is unimplemented
- //private static final String DEFAULT_KEY_ALGORITHM = SigType.ECDSA_SHA256_P256.isAvailable() ? "EC" : "DSA";
- //private static final int DEFAULT_KEY_SIZE = SigType.ECDSA_SHA256_P256.isAvailable() ? 256 : 1024;
- private static final String DEFAULT_KEY_ALGORITHM = "EdDSA";
- private static final int DEFAULT_KEY_SIZE = 256;
+ private static final String DEFAULT_KEY_ALGORITHM = SigType.ECDSA_SHA256_P256.isAvailable() ? "EC" : "DSA";
+ private static final int DEFAULT_KEY_SIZE = SigType.ECDSA_SHA256_P256.isAvailable() ? 256 : 1024;
+ //private static final String DEFAULT_KEY_ALGORITHM = "EdDSA";
+ //private static final int DEFAULT_KEY_SIZE = 256;
private static final String KS_DIR = "keystore";
private static final String CERT_DIR = "certificates/family";
private static final String CRL_DIR = "crls";