[Pkg-privacy-commits] [ricochet-im] 03/05: Merge tag 'upstream/1.1.3'

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository ricochet-im.

commit 7f6e1dfec1f55d6b580531e2b205103c20074b97
Merge: bcd34d4 3789ad4
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Oct 13 17:14:23 2016 +0200

    Merge tag 'upstream/1.1.3'
    
    Upstream version 1.1.3
    
    # gpg: Signature made Thu 13 Oct 2016 17:14:20 CEST
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 BUILDING.md                                        |   9 ++
 contrib/ricochet-seccomp-amd64.policy              |   3 +
 hardened.pri                                       |   3 +-
 ricochet.pro                                       |   4 +-
 src/core/ContactUser.cpp                           |   2 +-
 src/core/UserIdentity.cpp                          |  94 +++++++++++------
 src/core/UserIdentity.h                            |   1 +
 src/main.cpp                                       |  18 +++-
 .../{SetConfCommand.cpp => AddOnionCommand.cpp}    |  87 ++++++++--------
 src/tor/{SetConfCommand.h => AddOnionCommand.h}    |  29 +++---
 src/tor/HiddenService.cpp                          |  95 +++++++++--------
 src/tor/HiddenService.h                            |  27 +++--
 src/tor/TorControl.cpp                             | 113 +++++++++++++++++----
 src/tor/TorControl.h                               |   7 ++
 src/tor/TorManager.cpp                             |  42 ++++++--
 src/ui/LinkedText.cpp                              |   2 +-
 src/ui/qml/ContactIDField.qml                      |   1 +
 src/ui/qml/NetworkSetupWizard.qml                  |   9 --
 src/ui/qml/TorConfigurationPage.qml                |  13 +--
 src/ui/qml/TorPreferences.qml                      |   1 +
 src/utils/CryptoKey.cpp                            |  51 +++++++++-
 src/utils/CryptoKey.h                              |   3 +-
 src/utils/Settings.cpp                             |   2 +-
 tests/tests.pro                                    |   2 +-
 .../{cryptokey => tst_cryptokey}/tst_cryptokey.cpp |  27 ++++-
 .../{cryptokey => tst_cryptokey}/tst_cryptokey.pro |   2 +-
 translation/ricochet_da.ts                         |  44 ++++----
 27 files changed, 459 insertions(+), 232 deletions(-)

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