[Pkg-privacy-commits] [onioncircuits] 11/17: Merge branch 'master' of git://git.tails.boum.org/onioncircuits into upstream

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch master
in repository onioncircuits.

commit ef3745f6704c896feccf7fc66e5784930de15432
Merge: e31217d 450666c
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Thu Feb 18 23:36:54 2016 +0000

    Merge branch 'master' of git://git.tails.boum.org/onioncircuits into upstream

 .gitignore                                  |  2 +-
 MANIFEST.in                                 |  6 ++--
 README                                      |  8 ++---
 tormonitor => onioncircuits                 | 47 +++++++++++++++-----------
 tormonitor.desktop => onioncircuits.desktop |  9 ++---
 tormonitor.svg => onioncircuits.svg         |  0
 po/POTFILES.in                              |  2 +-
 po/fr.po                                    | 52 ++++++++++++++---------------
 setup.py                                    | 14 ++++----
 9 files changed, 74 insertions(+), 66 deletions(-)

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