diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-06 01:37:19 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-06 01:37:19 +0200 |
| commit | eb2334c6cb7c9ab9c260bc609ae43fb53d441f6f (patch) | |
| tree | a6b263b856bd035ac154b45fe7e91706918b25f3 /test/test_utils.py | |
| parent | 853cd810757a02252402da22ae77cab77c5a3fb6 (diff) | |
| parent | a8d931089c9ecf450b69321706825cf694c1c08e (diff) | |
| download | mitmproxy-eb2334c6cb7c9ab9c260bc609ae43fb53d441f6f.tar.gz mitmproxy-eb2334c6cb7c9ab9c260bc609ae43fb53d441f6f.tar.bz2 mitmproxy-eb2334c6cb7c9ab9c260bc609ae43fb53d441f6f.zip | |
Merge branch 'master' into readthedocs
Diffstat (limited to 'test/test_utils.py')
| -rw-r--r-- | test/test_utils.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 0cda23b4..d2bd97e1 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,6 +1,5 @@ import json from libmproxy import utils -from netlib import odict import tutils utils.CERT_SLEEP_TIME = 0 |