summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists/tails-common.list
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-01-11 07:23:14 +0000
committerintrigeri <intrigeri@boum.org>2017-01-11 07:23:14 +0000
commit1a3c62b96edd337cacd6e6b6d2c9eed1951784a8 (patch)
tree03033952eeb2329519c53a1b2be6dd91d5e81793 /config/chroot_local-packageslists/tails-common.list
parente45d9736580251764e6ea320594a0173fb814d97 (diff)
parenta912d782f4ba66da71d15acd81165d000f12d00a (diff)
Merge remote-tracking branch 'origin/feature/7870-include_onionshare' into devel
Fix-committed: #7870, #6742, #6788, #9001
Diffstat (limited to 'config/chroot_local-packageslists/tails-common.list')
-rw-r--r--config/chroot_local-packageslists/tails-common.list7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 4b4843d..147394f 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -154,8 +154,6 @@ macchanger
mat
monkeysign
monkeysphere
-# our onioncircuits-wrapper needs lckdo
-moreutils
msva-perl
nautilus
nautilus-wipe
@@ -164,6 +162,7 @@ network-manager
network-manager-gnome
ntfs-3g
obfs4proxy
+onionshare
libreoffice-calc
libreoffice-draw
libreoffice-gnome
@@ -406,3 +405,7 @@ python-qt4
# Provide gnome-open (used to open e.g. URLs in KeePassX, Icedove, Electrum...)
libgnome2-bin
+
+# tor-controlport-filter
+python3-psutil
+python3-yaml