[Pkg-privacy-commits] [torbrowser-launcher] 20/21: Merge tag 'v0.2.1' into debian

[Holger Levsen]

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

holger pushed a commit to annotated tag debian/0.2.1-1
in repository torbrowser-launcher.

commit 9e66238150e06b7734200a86707bf8906d0e3ccd
Merge: 03730cd de616b1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Nov 13 18:38:22 2015 +0100

    Merge tag 'v0.2.1' into debian
    
    Version 0.2.1

 BUILD.md                                       |  4 +-
 CHANGELOG.md                                   |  8 +++
 README.md                                      |  6 +-
 apparmor/torbrowser.Browser.firefox            | 17 ++---
 apparmor/torbrowser.Tor.tor                    |  3 +-
 apparmor/torbrowser.start-tor-browser          | 53 ---------------
 apparmor/usr.bin.torbrowser-launcher           |  2 +-
 build_rpm.sh                                   |  2 +-
 setup.py                                       |  1 -
 share/applications/torbrowser-settings.desktop |  5 +-
 share/applications/torbrowser.desktop          |  5 +-
 share/torbrowser-launcher/erinn.asc            | 51 --------------
 share/torbrowser-launcher/version              |  2 +-
 stdeb.cfg                                      |  1 +
 torbrowser_launcher/common.py                  | 43 +++++-------
 torbrowser_launcher/launcher.py                | 93 ++++++++++++--------------
 16 files changed, 94 insertions(+), 202 deletions(-)

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