Changeset 3214bc4


Ignore:
Timestamp:
Jan 31, 2013 3:40:15 PM (8 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
fea91a3
Parents:
a0befe5 (diff), 5f614db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '4e5a2d2f78b9a7603ece4e4b54720e83e062cbf4'

and '8bbaf8414a2475919844450aad53b325ee0f7e84'

Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    ra0befe5 r3214bc4  
    7070              "http://netdb.i2p2.no/" + "," +
    7171              "http://reseed.info/"  + "," +
    72               "http://i2p.feared.eu/";
     72              "http://i2p.feared.eu/" + "," +
     73              "http://netdb2.i2p2.no/";
    7374
    7475    /** @since 0.8.2 */
     
    8283              "https://netdb.i2p2.no/" + "," +
    8384              "https://reseed.info/"  + "," +
    84               "https://i2p.feared.eu/";
     85              "https://i2p.feared.eu/" + "," +
     86              "https://netdb2.i2p2.no/";
    8587
    8688    public static final String PROP_PROXY_HOST = "router.reseedProxyHost";
Note: See TracChangeset for help on using the changeset viewer.