merge of '4e5a2d2f78b9a7603ece4e4b54720e83e062cbf4'

and '8bbaf8414a2475919844450aad53b325ee0f7e84'
This commit is contained in:
meeh
2013-01-31 15:40:15 +00:00
2 changed files with 1256 additions and 2 deletions

File diff suppressed because it is too large Load Diff

View File

@ -69,7 +69,8 @@ public class Reseeder {
"http://193.150.121.66/netDb/" + "," +
"http://netdb.i2p2.no/" + "," +
"http://reseed.info/" + "," +
"http://i2p.feared.eu/";
"http://i2p.feared.eu/" + "," +
"http://netdb2.i2p2.no/";
/** @since 0.8.2 */
public static final String DEFAULT_SSL_SEED_URL =
@ -81,7 +82,8 @@ public class Reseeder {
"https://193.150.121.66/netDb/" + "," +
"https://netdb.i2p2.no/" + "," +
"https://reseed.info/" + "," +
"https://i2p.feared.eu/";
"https://i2p.feared.eu/" + "," +
"https://netdb2.i2p2.no/";
public static final String PROP_PROXY_HOST = "router.reseedProxyHost";
public static final String PROP_PROXY_PORT = "router.reseedProxyPort";