merge of '0f50b30246a463d980456a3654fb10431208c315'

     and '9b2d74e36e3d27e1e7a01c77c4127eb273e37415'

i2p2www/pages/site/get-involved/roadmap.html

@@ -164,6 +164,8 @@ sam3 - Up to SAM 3.2, better default signatures. Streaming, datagrams, and raw.
 jsam - Further development
 </li><li>
 Better support / encourage translation efforts
+</li><li>
+Android fixes
 </li></ul>
 
 
@@ -198,6 +200,10 @@ browser: new release, upstream tor changes, minor changes
 Browser identity management UI WebExtension for i2p Browser build
 </li><li>
 Browser news/documentation inclusion WebExtension for i2p Browser build
+</li><li>
+Android GMP 6 and 64-bit jbigi
+</li><li>
+Android fixes
 </li></ul>
 
 
@@ -209,7 +215,7 @@ Docker image documentation and promotion to first-class product
 </li><li>
 Auto-update server for OSX installer
 </li><li>
-Browser web extentions
+Browser web extensions
 </li><li>
 Onboarding improvements
 </li><li>
@@ -225,7 +231,7 @@ Revamped website navigation menu
 </li><li>
 Console improvements
 </li><li>
-ECIES Prop 144
+ECIES Prop 144 (continuing)
 </li><li>
 GMP 6.1.2
 </li><li>
@@ -242,26 +248,20 @@ LibSam - deduplication, documentation, support
 OSX right-click share to Snark
 </li><li>
 Split configuration
+</li><li>
+Android fixes
 </li></ul>
 
 <h2 id="4Q2019">4Q 2019 0.9.43-44</h2>
 <ul><li>
-Continue work on testnet
+Begin work on SSU2
 </li><li>
-Begin work on SSU2?
-</li><li>
-I2PTunnel socket-side NIO
-</li><li>
-Mattermost integration?
-</li><li>
-Readthedocs support?
-</li><li>
-Service lookup (proposal #123 types 9 and 11)
-</li><li>
-release process: move download.i2p2.de to multihomed self-hosted S3 with deploy scripts built into ant
+ECIES Prop 144 (continuing)
 </li><li>
 Debian packaging changes and improvements
 </li><li>
+I2P Browser?
+</li><li>
 Ready indication for Tails
 </li><li>
 Achieve reproducible build (#2279)
@@ -277,40 +277,17 @@ Use less risky code for /tmp handling in I2P initscript and systemd unit file (#
 Make i2p.service aware User/Group so that status is updated (#2324)
 </li><li>
 Make i2p.postinst not use recursive chmod
-</li></ul>
-
-
-<h2 id="2019-Bote">2019 I2P-Bote</h2>
-<p><b>Note: Developer needed</b></p>
-<ul><li>
-I2P-Bote fixes
-</li><li>
-Android I2P-Bote fixes
 </li><li>
-See github isses for details
+Android fixes
 </li></ul>
 
-
-<h2 id="2019-Android">2019 Android</h2>
-<p><b>Note: Developer needed</b></p>
+<h2 id="1H2020">1H 2020 0.9.45-47</h2>
 <ul><li>
-Android GMP 6 and 64-bit jbigi
-</li><li>
-Android gather user feedback
-</li><li>
-Android UI enhancements
-</li><li>
-Android router service as a library
-</li><li>
-Android logging improvements
-</li><li>
-Android wakelock fix
-</li><li>
-Android fixes
+Continue work on testnet
 </li><li>
-Android tunnel settings
+Continue work on SSU2
 </li><li>
-Android profiles
+Readthedocs support?
 </li></ul>