merge of '1da6f1bca3fa6708f15521a96ea3f24a486c9210'

and 'e779f6eadb1bc2af7db6ed345d5d217b86884134'

etc/reqs.txt

@@ -1,9 +1,9 @@
 pytz>=2012
-Flask==0.10.1
+Flask==1.0.2
 Babel==1.3
 Flask-Babel==0.9
-Flask-Cache==0.12
-Jinja2==2.7.2
+Flask-Caching==1.4.0
+Jinja2==2.10
 Pygments==1.6
 python-ctags
 docutils==0.11

i2p2www/__init__.py

@@ -7,7 +7,7 @@ except ImportError:
 try:
     from flask.ext.cache import Cache
 except ImportError:
-    from flask_cache import Cache
+    from flask_caching import Cache
 from docutils.core import publish_parts
 import os.path
 import os
@@ -23,7 +23,7 @@ except ImportError:
 # Constants
 
 CURRENT_I2P_VERSION = '0.9.38'
-CURRENT_I2P_FIREFOX_PROFILE_VERSION = '0.02a'
+CURRENT_I2P_FIREFOX_PROFILE_VERSION = '0.01a'
 
 CANONICAL_DOMAIN = 'geti2p.net'
 

i2p2www/pages/site/about/media.html

@@ -277,6 +277,10 @@ Robert Lei, December 31, 2018
 <li>{% trans mhatta='https://medium.com/@mhatta' -%}
 <a href="{{ mhatta }}">Articles by I2P contributor Masayuki Hatta on Medium.com</a>
 2019
+
+<li>{% trans ctrl='https://medium.com/@mhatta' -%}
+<a href="{{ ctrl }}">Enabling both .onion and .i2p routing with Proxy Auto-Configuration</a>
+Daniel Aleksandersen, February 7 2019
 {%- endtrans %}</li>
 
 </ul>