[Pkg-privacy-commits] [torbrowser-launcher] 303/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 79135e587d5add67316007c3a7df11dd4f10d921
Merge: b710cb4 b4a6c38
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Aug 2 18:33:31 2014 +0200

    Merge branch 'master' into debian

 BUILD.md                                           |   30 +
 CHANGELOG.md                                       |   11 +
 README.md                                          |   44 +-
 apparmor/torbrowser.Browser.firefox                |   99 +-
 apparmor/torbrowser.Tor.tor                        |   15 +-
 apparmor/torbrowser.start-tor-browser              |    8 +-
 apparmor/usr.bin.torbrowser-launcher               |   43 +-
 keys/README                                        |    6 -
 security_design.md                                 |   25 +
 share/torbrowser-launcher/alexandre.asc            |  100 --
 share/torbrowser-launcher/erinn.asc                | 1190 --------------------
 .../torbrowser-launcher/locale/nl_NL/messages.pot  |  332 +++++-
 share/torbrowser-launcher/mike.asc                 |   43 -
 share/torbrowser-launcher/sebastian.asc            |  161 ---
 share/torbrowser-launcher/version                  |    2 +-
 stdeb.cfg                                          |    5 +-
 torbrowser-launcher                                |   54 +-
 17 files changed, 443 insertions(+), 1725 deletions(-)

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