[Pkg-privacy-commits] [flashproxy] 26/65: Merge tag 'upstream/1.6'

[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 55d5b206e0685a7ec5e114a1306ae3397c058bd9
Merge: 0fedb4d b273399
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Mon May 19 10:14:30 2014 +0100

    Merge tag 'upstream/1.6'
    
    Upstream version 1.6
    
    # gpg: Signature made Mon 19 May 2014 10:14:26 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                         | 12 ++++++++
 LICENSE                           |  2 +-
 Makefile                          |  9 +++---
 Makefile.client                   |  1 -
 facilitator/Makefile.am           |  2 +-
 facilitator/configure.ac          |  2 +-
 facilitator/doc/appspot-howto.txt |  7 +++--
 flashproxy-client                 | 46 ++++++++++++++++++++++--------
 flashproxy-reg-appspot            | 18 ++----------
 flashproxy-reg-email              | 18 ++----------
 flashproxy/keys.py                | 26 +++++++++++++----
 flashproxy/test/test_keys.py      | 17 ++++++-----
 flashproxy/test/test_util.py      | 59 ++++++++++++++++++++++++++++++++++++++-
 flashproxy/util.py                | 12 ++++++--
 mkman.sh                          | 20 ++++++++-----
 proxy/flashproxy-test.js          | 23 +++++++--------
 proxy/modules/nodejs/Makefile     |  5 ++--
 setup-common.py                   |  5 +++-
 torrc                             |  2 --
 version.sh                        |  5 +++-
 20 files changed, 191 insertions(+), 100 deletions(-)

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