From 6b0951d1eece3a8152f1718efb8d607880fe794d Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 6 Jul 2016 13:30:46 +0200
Subject: [PATCH] Switching default Tor type to SOCKS5 (various bundles are
 discontinued)

---
 lib/core/defaults.py | 2 +-
 lib/core/option.py   | 2 +-
 lib/core/settings.py | 2 +-
 lib/parse/cmdline.py | 2 +-
 sqlmap.conf          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/core/defaults.py b/lib/core/defaults.py
index e8a78d7ac..71a8a8d4a 100644
--- a/lib/core/defaults.py
+++ b/lib/core/defaults.py
@@ -21,7 +21,7 @@ _defaults = {
    "risk":         1,
    "dumpFormat":   "CSV",
    "tech":         "BEUSTQ",
-   "torType":      "HTTP",
+   "torType":      "SOCKS5",
 }
 
 defaults = AttribDict(_defaults)
diff --git a/lib/core/option.py b/lib/core/option.py
index 88d9b216e..99d4a764b 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -2296,7 +2296,7 @@ def _setTorHttpProxySettings():
     if found:
         conf.proxy = "http://%s:%d" % (LOCALHOST, found)
     else:
-        errMsg = "can't establish connection with the Tor proxy. "
+        errMsg = "can't establish connection with the Tor HTTP proxy. "
         errMsg += "Please make sure that you have Vidalia, Privoxy or "
         errMsg += "Polipo bundle installed for you to be able to "
         errMsg += "successfully use switch '--tor' "
diff --git a/lib/core/settings.py b/lib/core/settings.py
index dd9df17aa..51b0f3d95 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.7.10"
+VERSION = "1.0.7.11"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index d6279798d..ab95f973e 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -173,7 +173,7 @@ def cmdLineParser(argv=None):
                                   help="Set Tor proxy port other than default")
 
         request.add_option("--tor-type", dest="torType",
-                                  help="Set Tor proxy type (HTTP (default), SOCKS4 or SOCKS5)")
+                                  help="Set Tor proxy type (HTTP, SOCKS4 or SOCKS5 (default))")
 
         request.add_option("--check-tor", dest="checkTor",
                                   action="store_true",
diff --git a/sqlmap.conf b/sqlmap.conf
index 05868f30e..712f98dd7 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -124,7 +124,7 @@ tor = False
 
 # Set Tor proxy type.
 # Valid: HTTP, SOCKS4, SOCKS5
-torType = HTTP
+torType = SOCKS5
 
 # Check to see if Tor is used properly.
 # Valid: True or False