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

[dcf at torproject.org]

commit 605dc9a6f264370ee65ddbfd30917de7c0b5c8dd
Merge: 26588bc 1c118c7
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 7 01:24:53 2013 -0800

    Merge branch 'master' into url_reg
    
    Conflicts:
    	doc/facilitator-howto.txt
    	facilitator/Makefile

 .gitattributes                              |    1 +
 .gitignore                                  |    1 +
 ChangeLog                                   |   14 +
 Makefile                                    |    2 +-
 README                                      |   30 +-
 doc/bundle-gnulinux.txt                     |   65 ++--
 doc/bundle-macosx.txt                       |   53 ++--
 doc/bundle-windows.txt                      |   56 ++--
 doc/facilitator-howto.txt                   |   66 ++--
 doc/websocket-transport.txt                 |    4 +-
 doc/windows-deployment-howto.txt            |   14 +-
 experiments/client-extract.py               |   50 +++
 experiments/client-graph.py                 |   96 +++++
 experiments/client-graph.r                  |    5 +
 experiments/proxy-extract.py                |   82 ++++
 experiments/proxy-graph.r                   |    5 +
 facilitator/Makefile                        |    4 +-
 facilitator/fac.py                          |   54 +++-
 facilitator/facilitator                     |   34 +-
 facilitator/facilitator-email-poller        |   55 +--
 facilitator/facilitator-reg                 |   59 +++
 facilitator/facilitator-reg-daemon          |  207 ++++++++++
 facilitator/facilitator-test                |    9 +
 facilitator/init.d/facilitator              |    5 +-
 facilitator/init.d/facilitator-email-poller |    7 +-
 facilitator/init.d/facilitator-reg-daemon   |  118 ++++++
 flashproxy-client                           |   30 +-
 flashproxy-reg-email                        |    2 +-
 flashproxy-reg-http                         |    2 +-
 init.d/websockify                           |   62 ---
 patches/websockify-binary-default.patch     |   40 --
 proxy/flashproxy.js                         |   61 +++-
 websocket-transport/Makefile                |   29 ++
 websocket-transport/pt.go                   |  591 +++++++++++++++++++++++++++
 websocket-transport/socks.go                |  107 +++++
 websocket-transport/websocket-server.go     |  265 ++++++++++++
 websocket-transport/websocket.go            |  432 +++++++++++++++++++
 37 files changed, 2369 insertions(+), 348 deletions(-)

diff --cc doc/facilitator-howto.txt
index 243fb45,4952cea..7c87338
--- a/doc/facilitator-howto.txt
+++ b/doc/facilitator-howto.txt
@@@ -19,13 -19,16 +19,20 @@@ facilitator
  The email rendezvous uses the helper program facilitator-email-poller.
  Clients use the flashproxy-reg-email program to send an encrypted
  message to a Gmail address. The poller constantly checks for new
- messages, decrypts and deletes them, and forwards the registrations to
- the facilitator.
+ messages and forwards them to facilitator-reg.
+ 
+ facilitator-reg is a simple program that forwards its standard input to
+ a locally running facilitator-reg-daemon process.
+ 
+ facilitator-reg-daemon accepts connections containing encrypted client
+ registrations and forwards them to the facilitator. It exists as a
+ process of its own so that only one program requires access to the
+ facilitator's private key.
  
 +The URL rendezvous uses the helper program flashproxy-reg-email. The
 +helper program doesn't actually make a registration; rather, it prints
 +out a URL which, when retrieved, makes the registration.
 +
  fac.py is a Python module containing code common to the various
  facilitator programs.