diff --git a/CONTRIBUTORS b/CONTRIBUTORS index fe22d9da9..3d056fb89 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,56 +1,51 @@ - 1067 Aldo Cortesi - 542 Maximilian Hils - 76 Marcelo Glezer + 1112 Aldo Cortesi + 569 Maximilian Hils + 79 Marcelo Glezer + 28 Jim Shaver 18 Henrik Nordstrom 13 Thomas Roth 12 Pedro Worcel - 11 Stephen Altamirano + 11 Jake Drahos 11 Justus Wingert - 11 Jim Shaver + 11 Stephen Altamirano 10 András Veres-Szentkirályi 9 Legend Tang - 8 Rouli 8 Jason A. Novak + 8 Rouli 7 Alexis Hildebrandt - 5 Matthias Urlichs + 6 Thomas Kriechbaumer 5 Brad Peabody + 5 Matthias Urlichs 5 Tomaz Muraus 5 elitest - 4 root + 5 iroiro123 + 4 Bryan Bishop + 4 Marc Liyanage 4 Valtteri Virtanen 4 Wade 524 - 4 Bryan Bishop 4 Youhei Sakurai - 4 Marc Liyanage + 4 root 3 Chris Neasbitt - 3 Zack B - 3 Kyle Manna + 3 David Weinstein 3 Eli Shvartsman + 3 Kyle Manna + 3 Zack B + 2 Bennett Blodinger 2 Choongwoo Han - 2 Rob Wills - 2 israel - 2 Mark E. Haase + 2 Heikki Hannikainen 2 Jaime Soriano Pastor 2 Jim Lloyd - 2 Heikki Hannikainen 2 Krzysztof Bielicki - 2 Bennett Blodinger + 2 Mark E. Haase 2 Michael Frister + 2 Rob Wills 2 alts - 1 Yuangxuan Wang - 1 capt8bit - 1 davidpshaw - 1 deployable - 1 joebowbeer - 1 meeee - 1 michaeljau - 1 peralta - 1 phil plante - 1 sentient07 - 1 vzvu3k6k + 2 isra17 + 2 israel 1 Andy Smith 1 Dan Wilbraham 1 David Shaw + 1 Doug Lethin 1 Eric Entzel 1 Felix Wolfsteller 1 Gabriel Kirkpatrick @@ -61,6 +56,7 @@ 1 James Billingham 1 Jean Regisser 1 Kit Randel + 1 Kyle Morton 1 Lucas Cimon 1 Mathieu Mitchell 1 Michael Bisbjerg @@ -82,7 +78,20 @@ 1 Steven Van Acker 1 Suyash 1 Tarashish Mishra + 1 TearsDontFalls 1 Terry Long 1 Ulrich Petri 1 Vyacheslav Bakhmutov 1 Wade Catron + 1 Yuangxuan Wang + 1 capt8bit + 1 davidpshaw + 1 deployable + 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 7836c8498..125bf24f4 100644 --- a/libmproxy/version.py +++ b/libmproxy/version.py @@ -1,4 +1,6 @@ -IVERSION = (0, 12, 2) +from __future__ import (absolute_import, print_function, division) + +IVERSION = (0, 13) VERSION = ".".join(str(i) for i in IVERSION) MINORVERSION = ".".join(str(i) for i in IVERSION[:2]) NAME = "mitmproxy"