From 6269f16034ace050013d0a0b33fc4cdd938facd5 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sat, 15 Sep 2018 20:33:12 -0700
Subject: [PATCH 1/3] Update all pip dependency versions

---
 install/requirements-windows.txt | 12 ++++++++++++
 install/requirements.txt         | 19 ++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/install/requirements-windows.txt b/install/requirements-windows.txt
index 6e03f6e8..5d88fec7 100644
--- a/install/requirements-windows.txt
+++ b/install/requirements-windows.txt
@@ -1,14 +1,26 @@
+altgraph==0.15
+certifi==2018.4.16
+chardet==3.0.4
 click==6.7
 Flask==0.12.2
 future==0.16.0
+idna==2.7
 itsdangerous==0.24
 Jinja2==2.10
+macholib==1.9
 MarkupSafe==1.0
+packaging==17.1
 pefile==2017.11.5
 PyInstaller==3.3.1
+pyparsing==2.2.0
+pypiwin32==223
 PyQt5==5.9.2
 PySocks==1.6.7
+python-dateutil==2.7.3
+pywin32==223
 requests==2.19.1
 sip==4.19.6
+six==1.11.0
 stem==1.6.0
+urllib3==1.23
 Werkzeug==0.14.1
diff --git a/install/requirements.txt b/install/requirements.txt
index ed83b995..16179eb7 100644
--- a/install/requirements.txt
+++ b/install/requirements.txt
@@ -1,12 +1,21 @@
+altgraph==0.16.1
+certifi==2018.8.24
+chardet==3.0.4
 click==6.7
-Flask==0.12.2
+Flask==1.0.2
+future==0.16.0
+idna==2.7
 itsdangerous==0.24
 Jinja2==2.10
+macholib==1.11
 MarkupSafe==1.0
-PyInstaller==3.3.1
-PyQt5==5.9.2
-PySocks==1.6.7
+pefile==2018.8.8
+PyInstaller==3.4
+PyQt5==5.11.2
+PyQt5-sip==4.19.12
+PySocks==1.6.8
 requests==2.19.1
-sip==4.19.6
+sip==4.19.8
 stem==1.6.0
+urllib3==1.23
 Werkzeug==0.14.1

From f90e96e21a4cfb6ca52c8e102b4ac57bf09e19b7 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sat, 15 Sep 2018 22:04:08 -0700
Subject: [PATCH 2/3] Monkeypatch flask to suppress output that isn't
 applicable to OnionShare

---
 onionshare/web.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/onionshare/web.py b/onionshare/web.py
index f67a4b16..68b8fbc2 100644
--- a/onionshare/web.py
+++ b/onionshare/web.py
@@ -32,6 +32,7 @@ import io
 from distutils.version import LooseVersion as Version
 from urllib.request import urlopen
 
+import flask
 from flask import (
     Flask, Response, Request, request, render_template, abort, make_response,
     flash, redirect, __version__ as flask_version
@@ -40,6 +41,15 @@ from werkzeug.utils import secure_filename
 
 from . import strings, common
 
+
+# Stub out flask's show_server_banner function, to avoiding showing warnings that
+# are not applicable to OnionShare
+def stubbed_show_server_banner(env, debug, app_import_path, eager_loading):
+    pass
+
+flask.cli.show_server_banner = stubbed_show_server_banner
+
+
 class Web(object):
     """
     The Web object is the OnionShare web server, powered by flask

From 05a9e3b158aa39d7d978fb1ba13b72d4322616b1 Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Sun, 16 Sep 2018 15:41:50 +1000
Subject: [PATCH 3/3] Bump windows versions of pip packages to match those of
 OS X

---
 install/requirements-windows.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/install/requirements-windows.txt b/install/requirements-windows.txt
index 5d88fec7..005acc9f 100644
--- a/install/requirements-windows.txt
+++ b/install/requirements-windows.txt
@@ -1,25 +1,25 @@
-altgraph==0.15
-certifi==2018.4.16
+altgraph==0.16.1
+certifi==2018.8.24
 chardet==3.0.4
 click==6.7
-Flask==0.12.2
+Flask==1.0.2
 future==0.16.0
 idna==2.7
 itsdangerous==0.24
 Jinja2==2.10
-macholib==1.9
+macholib==1.11
 MarkupSafe==1.0
 packaging==17.1
-pefile==2017.11.5
-PyInstaller==3.3.1
+pefile==2018.8.8
+PyInstaller==3.4
 pyparsing==2.2.0
 pypiwin32==223
-PyQt5==5.9.2
-PySocks==1.6.7
+PyQt5==5.11.2
+PySocks==1.6.8
 python-dateutil==2.7.3
 pywin32==223
 requests==2.19.1
-sip==4.19.6
+sip==4.19.8
 six==1.11.0
 stem==1.6.0
 urllib3==1.23