[Pkg-privacy-commits] [torbrowser-launcher] 02/26: Merge remote-tracking branch 'micah/master'

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag v0.2.7
in repository torbrowser-launcher.

commit 0c575c27d3c5c537c3450da2a886f7fb1ff4bd64
Merge: fefc2c1 857d0b4
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu Sep 15 11:10:36 2016 +0200

    Merge remote-tracking branch 'micah/master'

 CHANGELOG.md                        | 13 ++++++
 apparmor/torbrowser.Browser.firefox |  6 +--
 apparmor/torbrowser.Tor.tor         |  2 +-
 share/torbrowser-launcher/version   |  2 +-
 torbrowser_launcher/common.py       | 84 +++++++++++++++++++++++++++++++++----
 torbrowser_launcher/launcher.py     | 33 +++++++++++++--
 torbrowser_launcher/settings.py     | 14 +++++++
 7 files changed, 138 insertions(+), 16 deletions(-)

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