Merge pull request #1450 from vhaupert/master

Fix platform import, substitute "~" with user's home

mitmproxy/onboarding/app.py

@@ -48,6 +48,7 @@ class PEM(tornado.web.RequestHandler):
 
     def get(self):
         p = os.path.join(self.request.master.options.cadir, self.filename)
+        p = os.path.expanduser(p)
         self.set_header("Content-Type", "application/x-x509-ca-cert")
         self.set_header(
             "Content-Disposition",

mitmproxy/platform/__init__.py

@@ -1,8 +1,9 @@
 import sys
+import re
 
 resolver = None
 
-if sys.platform == "linux2":
+if re.match(r"linux(?:2)?", sys.platform):
     from . import linux
     resolver = linux.Resolver
 elif sys.platform == "darwin":