Merge branch 'master' into user-abstraction

2018-09-03 10:29:36 -05:00 · 2018-09-03 10:29:36 -05:00 · ccdf0801a8
parent 083003191f 1318bb3ea6
commit ccdf0801a8
2 changed files with 2 additions and 2 deletions
--- a/onionr/api.py
+++ b/onionr/api.py
@ -20,7 +20,7 @@
 import flask
 from flask import request, Response, abort, send_from_directory
 from multiprocessing import Process
-from gevent.wsgi import WSGIServer
+from gevent.pywsgi import WSGIServer
 import sys, random, threading, hmac, hashlib, base64, time, math, os, json
 from core import Core
 from onionrblockapi import Block
--- a/requirements.txt
+++ b/requirements.txt
@ -1,7 +1,7 @@
 urllib3==1.23
 requests==2.18.4
 PyNaCl==1.2.1
-gevent==1.2.2
+gevent==1.3.6
 sha3==0.2.1
 defusedxml==0.5.0
 simple_crypt==4.1.7