[Pkg-privacy-commits] [flashproxy] 38/65: Merge tag 'upstream/1.7'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit 2f78f54bcb20e0f7df1effced7bb5cd1948fde0b
Merge: 37b65f3 9b2bfcb
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Tue Jul 22 19:35:13 2014 +0100

    Merge tag 'upstream/1.7'
    
    Upstream version 1.7
    
    # gpg: Signature made Tue 22 Jul 2014 19:35:13 BST
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>"
    # gpg:                 aka "Ximin Luo <infinity0 at gmx.com>"
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>"
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>"

 ChangeLog                                          |  17 ++
 doc/flashproxy-client.1                            |   6 +-
 doc/flashproxy-client.1.txt                        |   2 -
 doc/flashproxy-reg-appspot.1                       |   6 +-
 doc/flashproxy-reg-appspot.1.txt                   |   2 -
 doc/flashproxy-reg-email.1                         |   6 +-
 doc/flashproxy-reg-email.1.txt                     |   2 -
 doc/flashproxy-reg-http.1                          |   6 +-
 doc/flashproxy-reg-http.1.txt                      |   2 -
 doc/flashproxy-reg-url.1                           |   8 +-
 doc/flashproxy-reg-url.1.txt                       |   2 -
 experiments/exercise/exercise.sh                   |   2 +-
 facilitator/.gitignore                             |   6 +-
 facilitator/INSTALL                                |   4 +-
 facilitator/Makefile.am                            |  38 +--
 facilitator/README                                 |  10 +-
 facilitator/configure.ac                           |   8 +-
 .../default/{facilitator => fp-facilitator}        |   0
 .../{facilitator-reg-daemon => fp-reg-decryptd}    |   0
 ...facilitator-email-poller => fp-registrar-email} |   0
 facilitator/doc/appspot-howto.txt                  |   2 +-
 facilitator/doc/email-howto.txt                    |  40 ++-
 facilitator/doc/facilitator-design.txt             |  22 +-
 facilitator/doc/http-howto.txt                     |   2 +-
 facilitator/examples/facilitator-relays            |   8 +-
 facilitator/examples/fp-facilitator.conf.in        |   2 +-
 facilitator/{facilitator => fp-facilitator}        |   2 +-
 ...{facilitator-test.py => fp-facilitator-test.py} |   4 +-
 facilitator/{facilitator-reg => fp-reg-decrypt}    |   4 +-
 .../{facilitator-reg-daemon => fp-reg-decryptd}    |   2 +-
 ...facilitator-email-poller => fp-registrar-email} |   8 +-
 facilitator/{facilitator.cgi => fp-registrar.cgi}  |   4 +-
 .../init.d/{facilitator.in => fp-facilitator.in}   |   6 +-
 ...acilitator-reg-daemon.in => fp-reg-decryptd.in} |   6 +-
 ...tator-email-poller.in => fp-registrar-email.in} |   6 +-
 flashproxy-client                                  | 310 +++++++++------------
 flashproxy-reg-appspot                             | 145 ++--------
 flashproxy-reg-email                               | 196 +++----------
 flashproxy-reg-http                                | 120 ++------
 flashproxy-reg-url                                 | 111 ++------
 flashproxy/keys.py                                 |  66 +++--
 flashproxy/reg.py                                  |  58 +++-
 flashproxy/util.py                                 |  41 +++
 mkman.sh                                           |   9 +-
 proxy/flashproxy-test.js                           |  27 ++
 proxy/flashproxy.js                                |  65 +++--
 torrc                                              |   8 +-
 47 files changed, 599 insertions(+), 802 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git