Merge branch 'develop'

andresriancho · Aug 12, 2015 · 6e48526 · 6e48526
2 parents e3e2be6 + 437a9b6
commit 6e48526
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/w3af/core/controllers/dependency_check/requirements.py b/w3af/core/controllers/dependency_check/requirements.py
@@ -39,8 +39,8 @@
                      PIPDependency('OpenSSL', 'pyOpenSSL', '0.15.1'),
                      PIPDependency('ndg', 'ndg-httpsclient', '0.3.3'),
 
-                     # We need 0.1.7 because of mitmproxy
-                     PIPDependency('pyasn1', 'pyasn1', '0.1.7'),
+                     # We need 0.1.8 because of mitmproxy
+                     PIPDependency('pyasn1', 'pyasn1', '0.1.8'),
 
                      PIPDependency('lxml', 'lxml', '3.4.4'),
                      PIPDependency('scapy.config', 'scapy-real', '2.2.0-dev'),

diff --git a/w3af/core/data/constants/version.txt b/w3af/core/data/constants/version.txt
@@ -1 +1 @@
-1.7.5
+1.7.6