From 9beae933ba02fbd2c2a4f3cb9af48499d64db269 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 6 Nov 2015 13:52:08 +1300
Subject: [PATCH] Bump version, update CONTRIBUTORS, CHANGELOG

---
 CHANGELOG            | 52 ++++++++++++++++++++++++++++++++++++++
 CONTRIBUTORS         | 60 +++++++++++++++++++++++++-------------------
 libmproxy/version.py |  2 +-
 3 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 589a54de5..71903b3f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,55 @@
+6 November 2015: mitmproxy 0.14
+
+    * Statistics: 399 commits, 13 contributors, 79 closed issues, 37 closed
+      PRs, 103 days
+
+    * Docs: Greatly updated docs now hosted on ReadTheDocs!
+      http://docs.mitmproxy.org
+
+    * Docs: Fixed Typos, updated URLs etc. (Nick Badger, Ben Lerner, Choongwoo
+      Han, onlywade, Jurriaan Bremer)
+
+    * mitmdump: Colorized TTY output
+
+    * mitmdump: Use mitmproxy's content views for human-readable output (Chris
+      Czub)
+
+    * mitmproxy and mitmdump: Support for displaying UTF8 contents
+
+    * mitmproxy: add command line switch to disable mouse interaction (Timothy
+      Elliott)
+
+    * mitmproxy: bug fixes (Choongwoo Han, sethp-jive, FreeArtMan)
+
+    * mitmweb: bug fixes (Colin Bendell)
+
+    * libmproxy: Add ability to fall back to TCP passthrough for non-HTTP
+      connections.
+
+    * libmproxy: Avoid double-connect in case of TLS Server Name Indication.
+      This yields a massive speedup for TLS handshakes.
+
+    * libmproxy: Prevent unneccessary upstream connections (macmantrl)
+
+    * Inline Scripts: New API for HTTP Headers:
+      http://docs.mitmproxy.org/en/latest/dev/models.html#netlib.http.Headers
+
+    * Inline Scripts: Properly handle exceptions in `done` hook
+
+    * Inline Scripts: Allow relative imports, provide `__file__`
+
+    * Examples: Add probabilistic TLS passthrough as an inline script
+
+    * netlib: Refactored HTTP protocol handling code
+
+    * netlib: ALPN support
+
+    * netlib: fixed a bug in the optional certificate verification.
+
+    * netlib: Initial Python 3.5 support (this is the first prerequisite for
+      3.x support in mitmproxy)
+
+
 24 July 2015: mitmproxy 0.13
 
     * Upstream certificate validation. See the --verify-upstream-cert,
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3d056fb89..5389db5fa 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,6 +1,7 @@
-  1112	Aldo Cortesi
-   569	Maximilian Hils
-    79	Marcelo Glezer
+  1122	Aldo Cortesi
+   765	Maximilian Hils
+    80	Marcelo Glezer
+    48	Thomas Kriechbaumer
     28	Jim Shaver
     18	Henrik Nordstrom
     13	Thomas Roth
@@ -13,41 +14,55 @@
      8	Jason A. Novak
      8	Rouli
      7	Alexis Hildebrandt
-     6	Thomas Kriechbaumer
      5	Brad Peabody
-     5	Matthias Urlichs
      5	Tomaz Muraus
+     5	Choongwoo Han
+     5	Matthias Urlichs
      5	elitest
      5	iroiro123
-     4	Bryan Bishop
      4	Marc Liyanage
      4	Valtteri Virtanen
      4	Wade 524
      4	Youhei Sakurai
      4	root
-     3	Chris Neasbitt
+     4	Chris Czub
+     4	Bryan Bishop
+     3	Kyle Manna
      3	David Weinstein
      3	Eli Shvartsman
-     3	Kyle Manna
+     3	Chris Neasbitt
      3	Zack B
-     2	Bennett Blodinger
-     2	Choongwoo Han
-     2	Heikki Hannikainen
-     2	Jaime Soriano Pastor
-     2	Jim Lloyd
-     2	Krzysztof Bielicki
-     2	Mark E. Haase
-     2	Michael Frister
      2	Rob Wills
-     2	alts
      2	isra17
      2	israel
+     2	Michael Frister
+     2	Heikki Hannikainen
+     2	Nick Badger
+     2	Jim Lloyd
+     2	Terry Long
+     2	Wade Catron
+     2	Krzysztof Bielicki
+     2	Mark E. Haase
+     2	alts
+     2	Bennett Blodinger
+     2	Jaime Soriano Pastor
+     2	Colin Bendell
+     1	joebowbeer
+     1	meeee
+     1	michaeljau
+     1	peralta
+     1	phil plante
+     1	sentient07
+     1	sethp-jive
+     1	vzvu3k6k
      1	Andy Smith
+     1	Ben Lerner
      1	Dan Wilbraham
      1	David Shaw
      1	Doug Lethin
      1	Eric Entzel
      1	Felix Wolfsteller
+     1	FreeArtMan
      1	Gabriel Kirkpatrick
      1	Henrik Nordström
      1	Ivaylo Popov
@@ -79,19 +94,12 @@
      1	Suyash
      1	Tarashish Mishra
      1	TearsDontFalls
-     1	Terry Long
+     1	Timothy Elliott
      1	Ulrich Petri
      1	Vyacheslav Bakhmutov
-     1	Wade Catron
      1	Yuangxuan Wang
      1	capt8bit
      1	davidpshaw
      1	deployable
+     1	gecko655
      1	jlhonora
-     1	joebowbeer
-     1	meeee
-     1	michaeljau
-     1	peralta
-     1	phil plante
-     1	sentient07
-     1	vzvu3k6k
diff --git a/libmproxy/version.py b/libmproxy/version.py
index 0af60af53..eb2193270 100644
--- a/libmproxy/version.py
+++ b/libmproxy/version.py
@@ -1,6 +1,6 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 13, 1)
+IVERSION = (0, 14, 0)
 VERSION = ".".join(str(i) for i in IVERSION)
 MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
 NAME = "mitmproxy"