diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
| commit | 729677cd85cffedec8f481f1b6025f00fb637e13 (patch) | |
| tree | 39c245643c5a3a48bd14c6e13757148bda54e2f3 /libmproxy/utils.py | |
| parent | 6fe175913e611097fdfdf0a6b20b1c05909374e1 (diff) | |
| parent | a558c016d4430b67d221a369abe0cde1f4a40fce (diff) | |
| download | mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.gz mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.bz2 mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'libmproxy/utils.py')
| -rw-r--r-- | libmproxy/utils.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libmproxy/utils.py b/libmproxy/utils.py index b2258b15..258626db 100644 --- a/libmproxy/utils.py +++ b/libmproxy/utils.py @@ -1,17 +1,3 @@ -# Copyright (C) 2010 Aldo Cortesi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. import os, datetime, urlparse, string, urllib, re import time, functools, cgi import json |