diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp
index 67c96c6801507d2ebd87bd20d69ffc151bc65832..f4b57eba3c2a4531f2afa89a76f5a6caaa95bf34 100644
--- a/apps/susidns/src/jsp/index.jsp
+++ b/apps/susidns/src/jsp/index.jsp
@@ -87,7 +87,7 @@
<%=intl._t("Hosts in the private address book can be accessed by you but their addresses are never distributed to others.")%>
<%=intl._t("The private address book can also be used for aliases of hosts in your other address books.")%>
</p>
-<center><img src="/themes/susidns/images/how.png" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" /></center>
+<center><img src="/themes/susidns/images/how.svg" height="367" width="600" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" /></center>
</div>
<div id="footer">
<hr>
diff --git a/history.txt b/history.txt
index 04bd3c9bf6d6be0ae20cd8caf1260d0d367773c0..f7153a703b6a186e6a91c6157ee1e0bc377fd313 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2016-01-20 zzz
+ * SusiDNS: Replace image (ticket #1301)
+
2016-01-17 zzz
* BuildHandler: Disable tunnel removal on next-hop timeout
* Console:
@@ -39,7 +42,7 @@
2015-12-20 zzz
* BuildHandler: Additional fixes (ticket #1738)
* CertUtil: Add methods to export private keys
- * Console: Sybil tool enhancementsrivate keys
+ * Console: Sybil tool enhancements
* Transports:
- Disconnect faster when first message is a
tunnel build request which we reject
diff --git a/installer/resources/themes/susidns/images/how.png b/installer/resources/themes/susidns/images/how.png
deleted file mode 100644
index 8d1e26192b6e0005b5e94c35a712faf98fc68084..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/susidns/images/how.png and /dev/null differ
diff --git a/installer/resources/themes/susidns/images/how.svg b/installer/resources/themes/susidns/images/how.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1ec27ee9950e65feeb110af307bd92eeb9c24b49
--- /dev/null
+++ b/installer/resources/themes/susidns/images/how.svg
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="900"
+ height="550"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="I2P_Addressbooks_2v2.svg"
+ inkscape:export-filename="/home/z3r0fox/Documents/I2P/I2P_Addressbooks.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <marker
+ inkscape:stockid="TriangleOutS"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleOutS"
+ style="overflow:visible">
+ <path
+ id="path4373"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+ transform="scale(0.2)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Send"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Send"
+ style="overflow:visible;">
+ <path
+ id="path4240"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+ transform="scale(0.2) rotate(180) translate(6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="TriangleOutM"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="TriangleOutM"
+ style="overflow:visible">
+ <path
+ id="path4370"
+ d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+ transform="scale(0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Mend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Mend"
+ style="overflow:visible;">
+ <path
+ id="path4252"
+ style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(0.6) rotate(180) translate(0,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lend"
+ style="overflow:visible;">
+ <path
+ id="path4246"
+ style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <linearGradient
+ id="linearGradient3833"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3835" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.70710678"
+ inkscape:cx="458.28588"
+ inkscape:cy="264.46843"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer3"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:showpageshadow="false"
+ showborder="false" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Local Records Bound">
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="Background">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.0422982;stroke-opacity:1"
+ id="rect6550"
+ width="931.9245"
+ height="579.78534"
+ x="-19.777842"
+ y="-12.83585"
+ ry="0" />
+ </g>
+ <path
+ style="fill:#dcdcdc;fill-opacity:1;stroke:#86887a;stroke-width:2.01356006;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 30.890714,69.164214 c -8.224961,0 -14.823986,6.541695 -14.823986,14.65625 l 0,216.781246 c 0,8.11456 0,21.16669 0,29.28125 l 0,78.1875 c 0,8.11456 6.599025,14.65625 14.823986,14.65625 l 401.989756,0 c 6.88999,0 21.77869,0 28.66604,0 l 411.99911,0 c 8.22497,0 14.85566,-6.54169 14.85566,-14.65625 l 0,-78.1875 c 0,-8.11456 -6.63069,-14.65625 -14.85566,-14.65625 l -411.99911,0 c -6.88735,0 -16.43942,-6.51044 -16.43942,-14.625 l 0,-216.781246 c 0,-8.114555 -6.6307,-14.65625 -14.85566,-14.65625 z"
+ id="rect4048"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssssssssssssss" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:7.75368643;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:7.75368654, 7.75368654;stroke-dashoffset:0;marker-end:url(#TriangleOutS)"
+ d="m 451.13412,399.89047 0,46.87194"
+ id="path4219"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-502.36218)">
+ <rect
+ style="fill:#dcdcdc;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 8;stroke-dashoffset:0"
+ id="rect4217"
+ width="288.49957"
+ height="128.69344"
+ x="29.698484"
+ y="680.42401"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.48403537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-1-8-0-4"
+ width="392.53958"
+ height="61.619305"
+ x="476.89587"
+ y="716.08234"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985"
+ width="401.03055"
+ height="61.619305"
+ x="248.85085"
+ y="960.64032"
+ ry="14.647212"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ inkscape:export-filename="/home/z3r0fox/Documents/I2P/I2P_Addressbooks.png" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
+ x="318.22424"
+ y="999.0943"
+ id="text3759"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3761"
+ x="318.22424"
+ y="999.0943"
+ style="font-size:20px">PUBLISHED ADDRESSBOOK</tspan></text>
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0"
+ width="401.03055"
+ height="61.619305"
+ x="250.2148"
+ y="839.92706"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.21147585;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-3"
+ width="261.59198"
+ height="61.619305"
+ x="39.99683"
+ y="714.26422"
+ ry="14.647212" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
+ x="123.64268"
+ y="548.29602"
+ id="text3910"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3912"
+ x="123.64268"
+ y="548.29602"
+ style="font-size:24px;font-style:normal;font-weight:bold;-inkscape-font-specification:Arial Bold">LOCAL RECORDS</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
+ x="592.61475"
+ y="548.38812"
+ id="text3804-7"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3806-0"
+ x="592.61475"
+ y="548.38812"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold">SUBSCRIPTIONS</tspan></text>
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.48403537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-1-8-0"
+ width="392.53958"
+ height="61.619305"
+ x="476.89584"
+ y="692.04077"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;stroke:#000000;stroke-width:1.45869457999999996;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+ id="rect2985-0-1-1-8-09"
+ width="392.53958"
+ height="59.532894"
+ x="34.247021"
+ y="588.80316"
+ ry="14.151262" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.48403537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-1-8-0-3"
+ width="392.53958"
+ height="61.619305"
+ x="476.89587"
+ y="667.99915"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.48403537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-1-8-0-3-8"
+ width="392.53958"
+ height="61.619305"
+ x="476.8959"
+ y="641.12903"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.48403537;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-1-8-0-3-8-6"
+ width="392.53958"
+ height="61.619305"
+ x="476.8959"
+ y="614.25903"
+ ry="14.647212" />
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.44015396;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect2985-0-1-1-8-0-3-8-6-2"
+ width="392.53958"
+ height="58.02914"
+ x="476.89584"
+ y="589.55286"
+ ry="13.793812" />
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="523.25903"
+ y="625.26965"
+ id="text3058"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3060"
+ x="523.25903"
+ y="625.26965">http://i2p-projekt.i2p/hosts.txt</tspan><tspan
+ sodipodi:role="line"
+ x="523.25903"
+ y="650.26965"
+ id="tspan3062" /></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
+ x="111.58013"
+ y="625.36176"
+ id="text3804-4"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3806-6"
+ x="111.58013"
+ y="625.36176"
+ style="font-size:20px">MASTER ADDRESSBOOK</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
+ x="48.546604"
+ y="752.23694"
+ id="text3804-0"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3806-7"
+ x="48.546604"
+ y="752.23694"
+ style="font-size:20px">PRIVATE ADDRESSBOOK</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
+ x="334.5625"
+ y="876.79767"
+ id="text3804"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3806"
+ x="334.5625"
+ y="876.79767"
+ style="font-size:20px">ROUTER ADDRESSBOOK</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="668.92303"
+ y="867.10022"
+ id="text4096"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4098"
+ x="668.92303"
+ y="867.10022"
+ style="font-weight:bold">SEARCHABLE BY</tspan><tspan
+ sodipodi:role="line"
+ x="668.92303"
+ y="892.10022"
+ id="tspan4100"
+ style="font-weight:bold">I2P APPLICATIONS</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="669.99786"
+ y="984.91705"
+ id="text4096-4"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ x="669.99786"
+ y="984.91705"
+ id="tspan4100-2"
+ style="font-weight:bold">OPTIONAL, FOR</tspan><tspan
+ sodipodi:role="line"
+ x="669.99786"
+ y="1009.9171"
+ id="tspan4128"
+ style="font-weight:bold">EEPSITES</tspan></text>
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.09225798;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 360.61885,654.35563 0,124.26272 -19.78125,-0.0723 20.75,29.19795 20.71875,29.19795 21.0625,-29.05357 21.03125,-29.0536 -17.9375,-0.0723 0,-124.40709 -45.84375,0 z"
+ id="rect4130"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.0965755;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 521.05801,654.02458 0,124.77607 -19.78125,-0.0725 20.75,29.31856 20.71875,29.31858 21.0625,-29.17362 21.03125,-29.1736 -17.9375,-0.0723 0,-124.92103 -45.84375,0 z"
+ id="rect4130-3" />
+ </g>
+</svg>
diff --git a/installer/resources/themes/susidns/images/how_fr.png b/installer/resources/themes/susidns/images/how_fr.png
deleted file mode 100644
index 43da5d091e98e8a034b523799d89976080c4a981..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/susidns/images/how_fr.png and /dev/null differ
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3c775e75ad2f161a3cd3d0220581c16b99d09b93..0e04b1445cf7ad279d778bf1dbbb2a045fdd813e 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 = 25;
+ public final static long BUILD = 26;
/** for example "-test" */
public final static String EXTRA = "-rc";