summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Updating SquashFS sort fileanonym2017-04-181-4551/+4596
* Update uBlock Origin patterns + settings file.anonym2017-04-181-164632/+2891
* Merge remote-tracking branch 'origin/feature/12444-tor-browser-6.5.2' into te...anonym2017-04-172-17/+17
|\
| * Upgrade Tor Browser to 6.5.2.anonym2017-04-132-17/+17
* | Revert "Tighten regular expressions slightly."anonym2017-04-172-2/+2
|/
* tor.sh: revert back to communicating with tor over TCP.anonym2017-04-073-15/+4
* Use more extended regexes.anonym2017-04-071-3/+3
* tor.sh: fixups on "communicate via the UNIX socket instead of TCP port".anonym2017-04-072-16/+30
* Restore testing's base branch.anonym2017-04-061-1/+1
* Freeze APT snapshots for 2.12~rc1.anonym2017-04-062-2/+2
* Merge remote-tracking branch 'origin/feature/12411-tor-bootstrap-fixes' into ...anonym2017-04-064-61/+26
|\
| * Merge remote-tracking branch 'origin/devel' into feature/12411-tor-bootstrap-...anonym2017-04-0429-714/+36
| |\
| * | Correct comment.anonym2017-03-311-2/+1
| * | Kill unused code.anonym2017-03-311-4/+0
| * | Simplify.anonym2017-03-311-4/+1
| * | Get tor's bootstrap progress via GETINFO instead of log grep:ing.anonym2017-03-312-20/+4
| * | tor.sh: communicate via the UNIX socket instead of TCP port.anonym2017-03-312-1/+15
| * | Stop restarting tor if bootstrapping stalls.anonym2017-03-291-36/+11
* | | Empty the list of APT overlays: they were mergedanonym2017-04-062-0/+0
* | | Update uBlock Origin patterns + settings file.anonym2017-04-061-10570/+230741
| |/ |/|
* | Tighten regular expressions slightly.anonym2017-04-032-2/+2
* | Merge remote-tracking branch 'hybridwipe/bugfix/10950-add-gnome-sound-recorde...anonym2017-04-031-0/+4
|\ \
| * | config/chroot_local-packageslists/tails-common.list: add gnome-sound-recorderAustin English2017-03-221-0/+4
| |/
* | Merge remote-tracking branch 'origin/feature/12263-remove-i2p' into develanonym2017-04-0322-708/+7
|\ \
| * | Reintroduce dkms hook, that was removed by mistake in commit:e9d0204.intrigeri2017-03-161-0/+46
| * | Merge remote-tracking branch 'origin/devel' into feature/12263-remove-i2pintrigeri2017-03-155-2110/+3652
| |\ \ | | |/
| * | Drop the "I2P will be removed in Tails 2.12" notification (refs: #12263).intrigeri2017-03-063-75/+0
| * | Merge branch 'devel' into feature/12263-remove-i2pintrigeri2017-03-0623-48/+307
| |\ \
| * | | Completely remove I2P.anonym2017-02-2822-680/+8
* | | | Merge remote-tracking branch 'origin/bugfix/12307-virtualbox-backport' into d...anonym2017-04-033-1/+2
|\ \ \ \
| * | | | Revert "Don't install virtualbox-guest-x11 (refs: #12307)."intrigeri2017-03-081-0/+1
| * | | | Install virtualbox-* 5.1.14-dfsg-3~bpo8+1 from our custom APT repository (ref...intrigeri2017-03-081-1/+1
| * | | | Enable the bugfix-12307-virtualbox-backport APT overlay (refs: #12307).intrigeri2017-03-081-0/+0
* | | | | Merge remote-tracking branch 'origin/feature/12209-dont-add-amnesia-to-the-au...anonym2017-04-031-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'devel' into feature/12209-dont-add-amnesia-to-the-audio-groupintrigeri2017-03-0623-48/+307
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Don't add the live user to the "audio" group (refs: #12209).intrigeri2017-02-081-1/+1
| | |_|/ / | |/| | |
* | | | | Merge remote-tracking branch 'origin/feature/12125-tmpfs-on-var-tmp' into develanonym2017-04-032-0/+16
|\ \ \ \ \
| * | | | | Mount a dedicated filesystem on /var/tmp, to mitigate the hardlinks permissio...intrigeri2017-03-082-0/+16
| | |_|/ / | |/| | |
* | | | | Merge branch 'stable' into develanonym2017-04-033-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'origin/bugfix/12315-CVE-2017-2636' into stableanonym2017-04-031-0/+2
| |\ \ \ \
| | * | | | Protect against CVE-2017-2636 by disabling the n-hdlc kernel module (refs: #1...intrigeri2017-03-191-0/+2
| * | | | | hooks: be more flexible when matching local packages in apt list fileArnaud2017-04-032-4/+4
| |/ / / /
* | | | | Clean up libdvd-pkg build files, again (Closes: #11273).intrigeri2017-03-131-0/+1
* | | | | Merge branch 'stable' into develintrigeri2017-03-111-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Retry curl and APT operations up to 20 times to make the ISO build more robus...intrigeri2017-03-111-1/+1
* | | | Pull ttdnsd from our custom APT repository.intrigeri2017-03-081-1/+1
* | | | Merge branch 'stable' into develanonym2017-03-062-2108/+3649
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Empty the list of APT overlays: they were mergedanonym2017-03-062-0/+0
| * | Update uBlock Origin patterns + settings file.anonym2017-03-061-2108/+3649
* | | Don't install virtualbox-guest-x11 (refs: #12298).intrigeri2017-03-051-1/+0