diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 534f60346..b21daadff 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -2274,7 +2274,7 @@ class YoutubeDL(object):
             if hasattr(handler, 'proxies'):
                 proxy_map.update(handler.proxies)
         self._write_string('[debug] Proxy map: ' + re.sub(
-            r'(https?://)(?:(?:[^:/\'"@]+:)?[^@]+)(@)',
+            r'((?:http|socks5)s?://)(?:(?:[^:@]+:)?[^@]+)(@)',
             r'\1PRIVATE\2',
             compat_str(proxy_map)) + '\n')
 
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index efb05b8e9..f11bf13df 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -21,7 +21,7 @@ from .version import __version__
 
 
 def _hide_login_info(opts):
-    PRIVATE_OPTS = set(['-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username', '--proxy'])
+    PRIVATE_OPTS = set(['-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username', '--proxy', '--geo-verification-proxy'])
     eqre = re.compile('^(?P<key>' + ('|'.join(re.escape(po) for po in PRIVATE_OPTS)) + ')=.+$')
 
     def _scrub_eq(o):