Prep for release: CHANGELOG and CONTRIBUTORS

4 files changed, 53 insertions, 36 deletions

diff --git a/CHANGELOG b/CHANGELOG
index c1cd9436..441474f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,25 @@
+25 August 2013: mitmproxy 0.9.2:
+
+    * Improvements to the mitmproxywrapper.py helper script for OSX.
+    
+    * Don't take minor version into account when checking for serialized file
+      compatibility.
+
+    * Fix a bug causing resource exhaustion under some circumstances for SSL
+      connections.
+
+    * Revamp the way we store interception certificates. We used to store these
+      on disk, they're now in-memory. This fixes a race condition related to
+      cert handling, and improves compatibility with Windows, where the rules
+      governing permitted file names are weird, resulting in errors for some
+      valid IDNA-encoded names.
+
+    * Display transfer rates for responses in the flow list.
+    
+    * Many other small bugfixes and improvements.
+    
+
+
 
 16 June 2013: mitmproxy 0.9.1:
 
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e7ea1fb7..5ad5d135 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,39 +1,42 @@
-   777	Aldo Cortesi
+   801	Aldo Cortesi
     18	Henrik Nordstrom
     13	Thomas Roth
+    13	Maximilian Hils
     11	Stephen Altamirano
     10	András Veres-Szentkirályi
-     8	Rouli
      8	Jason A. Novak
+     8	Rouli
      7	Alexis Hildebrandt
-     6	Maximilian Hils
+     4	Marc Liyanage
      4	Valtteri Virtanen
      4	Bryan Bishop
      3	Chris Neasbitt
-     2	Heikki Hannikainen
+     3	Kyle Manna
      2	Jim Lloyd
-     2	Mark E. Haase
+     2	Matthias Urlichs
      2	Michael Frister
-     2	Rob Wills
      2	alts
+     2	Rob Wills
      2	israel
-     1	Mathieu Mitchell
-     1	Michael Bisbjerg
-     1	capt8bit
-     1	Nicolas Esteves
+     2	Mark E. Haase
+     2	Heikki Hannikainen
+     1	Oleksandr Sheremet
      1	Paul
-     1	phil plante
      1	Rory McCann
-     1	Jakub Nawalaniec
      1	Rune Halvorsen
      1	Sahn Lam
-     1	Ivaylo Popov
-     1	Andy Smith
-     1	Ulrich Petri
-     1	Henrik Nordström
      1	Felix Wolfsteller
+     1	Eric Entzel
+     1	Ulrich Petri
+     1	Andy Smith
      1	Yuangxuan Wang
-     1	Kit Randel
-     1	Marc Liyanage
+     1	capt8bit
      1	meeee
-     1	Eric Entzel
+     1	Jakub Nawalaniec
+     1	Kit Randel
+     1	phil plante
+     1	Ivaylo Popov
+     1	Mathieu Mitchell
+     1	Henrik Nordström
+     1	Michael Bisbjerg
+     1	Nicolas Esteves
diff --git a/release/osx-binaries b/release/osx-binaries
index a5f17ba5..4be85800 100755
--- a/release/osx-binaries
+++ b/release/osx-binaries
@@ -2,8 +2,15 @@
 
 # Quick and dangerous script for building OSX binaries.
 
-# First, have a recent checkout of the dev version of pyinstaller. Change into
-# the pyinstaller directory, and then run this script.
+# A few quirks to note, which should be re-checked every release:
+# - We require the latest development version of PyInstaller.
+ 
+# - PyInstaller has trouble detecting the zope.interfaces package. This is
+# required by Twisted, which for mysterious reasons is required by Urwid. The
+# answer is to touch the __init__.py file in the zope directory. On my system:
+#   touch /Library/Python/2.7/site-packages/zope/__init__.py
+
+# To run, change into the pyinstaller directory, and then run this script.
 
 DST=/tmp/osx-mitmproxy
 MITMPROXY=~/mitmproxy/mitmproxy
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index ad61de60..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Flask==0.9
-Jinja2==2.7
-MarkupSafe==0.18
-PIL==1.1.7
-Werkzeug==0.8.3
-lxml==3.2.1
-netlib==0.9
-nose==1.3.0
-pathod==0.9
-pyOpenSSL==0.13
-pyasn1==0.1.7
-requests==1.2.2
-urwid==1.1.1
-wsgiref==0.1.2
-jsbeautifier==1.4.0