merge of '2542a527f53e4df3896ae26f5b0cf7d0a45128ff'

     and '4944f31a9bec7dcacd3a97f6e451fd4eaf5f4096'

router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

@@ -94,7 +94,8 @@ public class Reseeder {
               "https://193.150.121.66/netDb/" + "," +
               "https://netdb.i2p2.no/" + "," +
               "https://reseed.info/"  + "," +
-              "https://reseed.pkol.de/" + "," +
+              //Temp disabled (ticket #1326)
+              //"https://reseed.pkol.de/" + "," +
                //Temp disabled (ticket #1276)
               //"https://uk.reseed.i2p2.no/" + "," +
               "https://i2p-netdb.innovatio.no/" + "," +

tests/scripts/checkremotecerts.sh

@@ -4,7 +4,7 @@ set -u
 
 BASEDIR="$(dirname $0)/../../"
 cd "$BASEDIR"
-RESEEDHOSTS=$(sed -e '/\s\+"https:\/\/[-a-z0-9.]/!d' -e 's/.*"https:\/\/\([-a-z0-9.]\+\).*/\1/' router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java)
+RESEEDHOSTS=$(sed -e '/^\s\+"https:\/\/[-a-z0-9.]/!d' -e 's/.*"https:\/\/\([-a-z0-9.]\+\).*/\1/' router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java)
 CERTHOME="installer/resources/certificates"
 CACERTS=$(mktemp)
 WORK=$(mktemp -d)