Merge remote-tracking branch 'upstream/master' into print-bracket-fix

Conflicts:
	examples/har_extractor.py
	examples/nonblocking.py
	examples/read_dumpfile
	libmproxy/web/app.py

1 files changed, 4 insertions, 3 deletions

diff --git a/dev b/dev
index 9f66cbaf..0860157e 100755
--- a/dev
+++ b/dev
@@ -1,11 +1,12 @@
-#!/bin/sh
+#!/bin/bash
+set -e
 VENV=../venv.mitmproxy
 
-virtualenv $VENV
+python -m virtualenv $VENV
 source $VENV/bin/activate
 pip install --src .. -r requirements.txt
 
 echo ""
 echo "* Created virtualenv environment in $VENV."
 echo "* Installed all dependencies into the virtualenv."
-echo "* Activated virtualenv environment."
\ No newline at end of file
+echo "* Activated virtualenv environment."