[Pkg-privacy-commits] [torbrowser-launcher] 371/476: Merge branch 'master' into debian

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit 695c7e0e1101b65f95de135ec1705030bffc17ce
Merge: 2239b19 25a7b98
Author: Ulrike Uhlig <u at 451f.org>
Date:   Tue Sep 2 09:19:50 2014 +0200

    Merge branch 'master' into debian

 CHANGELOG.md                                       |  6 ++
 apparmor/torbrowser.Browser.firefox                | 75 ++++++++++++----------
 apparmor/torbrowser.Tor.tor                        | 12 ++--
 apparmor/torbrowser.start-tor-browser              | 17 +++--
 apparmor/usr.bin.torbrowser-launcher               |  7 +-
 requirements.txt                                   | 16 +++++
 setup.py                                           | 16 +++--
 share/torbrowser-launcher/locale/en/messages.pot   |  2 +-
 .../torbrowser-launcher/locale/nl_NL/messages.pot  |  2 +-
 share/torbrowser-launcher/version                  |  2 +-
 torbrowser-launcher                                | 55 ++++++++++++----
 11 files changed, 139 insertions(+), 71 deletions(-)

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