propagate from branch 'i2p.i2p' (head 3d405c867f6903bf1d69b04c1daebf3146882525)

to branch 'i2p.i2p.zzz.test4' (head bfd85b10fdd1542526a4b9c53e5d4a733087f317)

apps/routerconsole/jsp/viewhistory.jsp

@@ -0,0 +1,12 @@
+<%
+/*
+ * USE CAUTION WHEN EDITING
+ * Trailing whitespace OR NEWLINE on the last line will cause
+ * IllegalStateExceptions !!!
+ *
+ * Do not tag this file for translation.
+ */
+response.setContentType("text/plain");
+String base = net.i2p.I2PAppContext.getGlobalContext().getBaseDir().getAbsolutePath();
+net.i2p.util.FileUtil.readFile("history.txt", base, response.getOutputStream());
+%>

apps/routerconsole/jsp/web.xml

@@ -17,6 +17,11 @@
       <url-pattern>/javadoc/*</url-pattern>
     </servlet-mapping>
     
+    <servlet-mapping> 
+      <servlet-name>net.i2p.router.web.jsp.viewhistory_jsp</servlet-name>
+      <url-pattern>/history.txt</url-pattern>
+    </servlet-mapping>
+    
     <session-config>
         <session-timeout>
             30