[Pkg-privacy-commits] [torbrowser-launcher] 14/59: Merge remote-tracking branch 'upstream-repo/master' into apparmor-e10s

[Roger Shimizu]

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

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit 0184abb4004b21a5ce144149c242a61cd1b1fee0
Merge: 33502fa a20103c
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Jun 23 07:11:41 2017 +0000

    Merge remote-tracking branch 'upstream-repo/master' into apparmor-e10s

 CHANGELOG.md                                       |  8 ++++++
 share/torbrowser-launcher/sks-keyservers.netCA.pem | 32 ++++++++++++++++++++++
 share/torbrowser-launcher/version                  |  2 +-
 torbrowser_launcher/common.py                      | 30 +++++++++++++++++++-
 torbrowser_launcher/launcher.py                    |  9 ++++--
 5 files changed, 77 insertions(+), 4 deletions(-)

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