Changeset 5dd6f2d


Ignore:
Timestamp:
Jan 7, 2017 3:48:44 PM (3 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
14bacc2, 2df64cd
Parents:
7f9a211 (diff), ca440a50 (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 'a84cabd267418e1cf436c975915ed5b91e39ae86'

and 'aafd3b9469e494f4f106a5c60c2139947c150679'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java

    r7f9a211 r5dd6f2d  
    128128        // Do the add and redirect.
    129129        if (targetRequest.equals("/add")) {
     130            if (query == null) {
     131                out.write(ERR_ADD.getBytes("UTF-8"));
     132                return;
     133            }
    130134            Map<String, String> opts = new HashMap<String, String>(8);
    131135            // this only works if all keys are followed by =value
  • history.txt

    r7f9a211 r5dd6f2d  
     12017-01-07 zzz
     2 * i2ptunnel: Fix NPE on proxy.i2p/add when no params
     3
     42017-01-06 zzz
     5 * EepGet: Recognize more status codes
     6
     72017-01-04 zzz
     8 * Crypto: Enforce correct seed and hash lengths in EdDSAPrivateKeySpec
     9 * Data: No longer sort addresses in an RI by SHA256
     10 * Router: Replace random tunnel keys when rekeying
     11
     122016-12-24 zzz
     13 * Utils: Add RKG command line tool
     14
     152016-12-23 zzz
     16 * Console: Add Referrer-Policy header
     17
    1182016-12-22 zzz
    219 * Blocklist:
     
    421   - Check blocklist when loading RIs
    522   - Ensure blocklist is initialized before netdb
     23 * Clock: Fix duplicate notification of clock shift listeners
    624 * Console: Limit age of news entries displayed
    725 * Update: Fix JVM crash and i2p.jar corruption when updating from -1
  • router/java/src/net/i2p/router/RouterVersion.java

    r7f9a211 r5dd6f2d  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 2;
     21    public final static long BUILD = 3;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.