[Pkg-privacy-commits] [torbrowser-launcher] 16/48: Merge branch 'dephekt-master'

[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 1a2e43cbfc9c25fc083d4ef353d26aaf503e0301
Merge: 0b5ea6d 1949a94
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Mar 13 15:46:15 2017 -0700

    Merge branch 'dephekt-master'

 BUILD.md                        |   4 +-
 build_rpm.sh                    |   4 +-
 stdeb.cfg                       |   2 +-
 torbrowser_launcher/common.py   |  49 +++++++------------
 torbrowser_launcher/launcher.py | 104 ++++++++++++++++++++++++++--------------
 5 files changed, 90 insertions(+), 73 deletions(-)

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