[tor-commits] [flashproxy/js] Merge branch 'master' into js

[dcf at torproject.org]

commit 3396d52885bfdf57feedef75fdd7426106becf16
Merge: 96b3d5d f2ab3c9
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Apr 2 09:39:29 2012 -0700

    Merge branch 'master' into js

 README         |    2 +-
 facilitator.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc README
index b3cbc2d,c7d6a79..b263862
--- a/README
+++ b/README
@@@ -104,19 -148,7 +104,19 @@@ If tor apparently hangs here
  wait a few minutes. It can take a while to download relay descriptors.
  
  
 +== How to run a relay
 +
 +The relay runs with a WebSocket proxy in external proxy mode.
 +	git clone git://github.com/kanaka/websockify.git
 +This command proxies WebSocket on port 9901 to a local ORPort on 9001.
 +	./websockify :9901 127.0.0.1:9001
 +The init.d script described under "Installing so as to restart at boot"
 +does this automatically.
 +
 +Add this line to torrc to make the relay use the external proxy:
 +	ServerTransportPlugin websocket proxy 127.0.0.1:9901
 +
- == How to put a flash proxy badge on a web page.
+ == How to put a flash proxy badge on a web page
  
  Paste in this HTML where you want the badge to appear: