From 1a9120c0c8330112fc0023892d7aea14467499de Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 5 May 2014 09:59:30 +0000
Subject: [PATCH] Recommend forward-socks5t when using Tor

It seems to work fine and modifying the Tor configuration
to profit from it hasn't been necessary for a while now.
---
 doc/source/faq.sgml      | 11 +++++++----
 doc/source/p-config.sgml |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 5c14402d..699fd819 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -27,7 +27,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
 
- $Id: faq.sgml,v 2.98 2013/12/16 11:20:14 fabiankeil Exp $
+ $Id: faq.sgml,v 2.99 2014/02/10 14:43:46 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -78,7 +78,7 @@
  </subscript>
 </pubdate>
 
-<pubdate>$Id: faq.sgml,v 2.98 2013/12/16 11:20:14 fabiankeil Exp $</pubdate>
+<pubdate>$Id: faq.sgml,v 2.99 2014/02/10 14:43:46 fabiankeil Exp $</pubdate>
 
 <!--
 
@@ -1803,7 +1803,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 </para>
 
 <para>
- Since <application>Privoxy</application> 3.0.5, its
+ <application>Privoxy's</application>
  <ulink url="../user-manual/config.html">main configuration file</ulink>
  is already prepared for <application>Tor</application>, if you are using a
  default <application>Tor</application> configuration and run it on the same
@@ -1813,7 +1813,7 @@ us help you. Your efforts are not wasted, and we do appreciate them.
 </para>
 <para>
  <screen>
-#        forward-socks5             /     127.0.0.1:9050 .
+#        forward-socks5t             /     127.0.0.1:9050 .
  </screen>
 </para>
 <para>
@@ -3028,6 +3028,9 @@ browsing has slowed to a crawl. What gives? </title>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 $Log: faq.sgml,v $
+Revision 2.99  2014/02/10 14:43:46  fabiankeil
+Make 'demoronizer' FAQ entries more generic
+
 Revision 2.98  2013/12/16 11:20:14  fabiankeil
 Spell 'more reliably' more correctly
 
diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 01faa081..c1ef4d7b 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Used with other docs and files only.
 
- $Id: p-config.sgml,v 2.102 2013/10/30 14:30:24 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.103 2014/02/10 14:39:13 fabiankeil Exp $
 
  Copyright (C) 2001-2011 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -97,7 +97,7 @@
  Sample Configuration File for Privoxy &p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.102 2013/10/30 14:30:24 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.103 2014/02/10 14:39:13 fabiankeil Exp $
 </para>
 <para>
 Copyright (C) 2001-2013 Privoxy Developers http://www.privoxy.org/
@@ -2185,7 +2185,7 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
    </para>
    <para>
     <screen>
-  forward-socks5   /               127.0.0.1:9050 .
+  forward-socks5t   /               127.0.0.1:9050 .
 </screen>
    </para>
 
-- 
2.39.2