From 32ab7171eafbe218bf83f284011d13d964119c71 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 1 Dec 2011 10:07:39 +0000
Subject: [PATCH] minor update

---
 lib/core/option.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/core/option.py b/lib/core/option.py
index 42cf3687b..c64ac6a86 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1768,8 +1768,8 @@ def __basicOptionValidation():
         errMsg = "switch --tor is incompatible with switch --proxy"
         raise sqlmapSyntaxException, errMsg
 
-    if conf.checkTor and not conf.tor:
-        errMsg = "switch --check-tor requires usage of switch --tor"
+    if conf.checkTor and not (conf.tor or conf.proxy):
+        errMsg = "switch --check-tor requires usage of switch --tor (or --proxy with HTTP proxy address using Tor)"
         raise sqlmapSyntaxException, errMsg
 
     if conf.skip and conf.testParameter: