[tor-commits] [flashproxy/master] Use current configuration in design.txt.

[dcf at torproject.org]

commit 252fdae9bdd93e38602e7b6614d0b589d3c59662
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Jul 5 03:54:27 2012 -0700

    Use current configuration in design.txt.
---
 doc/design.txt |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/design.txt b/doc/design.txt
index 71cf554..7520cb5 100644
--- a/doc/design.txt
+++ b/doc/design.txt
@@ -84,9 +84,10 @@ Design of flash proxies
   The Tor client must be configured to make its connections through a
   local proxy (the client transport plugin). This configuration is
   sufficient:
+    ClientTransportPlugin websocket socks4 127.0.0.1:9001
     UseBridges 1
-    Bridge 127.0.0.1:9001
-    Socks4Proxy 127.0.0.1:9001
+    Bridge websocket 127.0.0.1:9001
+    LearnCircuitBuildTimeout 0
   The address given for the "Bridge" option is actually irrelevant. The
   client transport plugin will ignore it and connect (through the flash
   proxy) to a Tor relay. The Tor client does not have control of its