summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/feature/tor-nightly-master' into test/to...test/tor-bootstrap-robustness_tor-0.3.1.xanonym2017-03-252-0/+5
|\
| * Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-03-142-1/+2
| |\
| * \ Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-03-093-2109/+3650
| |\ \
| * \ \ Merge branch 'devel' into feature/tor-nightly-masterintrigeri2017-03-0623-48/+307
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-02-0757-199638/+103233
| |\ \ \ \
| * | | | | Install Tor nightly builds from their master branch.intrigeri2016-12-082-2/+2
| * | | | | Also install tor-geoipdb 0.2.9.x, for consistency.intrigeri2016-12-081-1/+1
| * | | | | Merge remote-tracking branch 'origin/devel' into feature/12012-tor-0.2.9intrigeri2016-12-0210-21/+53
| |\ \ \ \ \
| * | | | | | Pin tor to tor-experimental-0.2.9.x-jessiesegfault2016-12-021-0/+4
| * | | | | | Add tor-experimental-0.2.9.x-jessie apt sourcesegfault2016-12-021-0/+1
* | | | | | | WIP: ISOanonym2017-03-257-329/+21
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
* | | | | Install virtualbox-guest-* from sid (refs: #12298).intrigeri2017-03-051-1/+1
* | | | | Merge branch 'stable' into develintrigeri2017-03-056-11/+98
|\ \ \ \ \ | |/ / / /
| * | | | Make notification action ids unique, in case it helps with the weird behaviou...intrigeri2017-03-053-3/+6
| * | | | Merge branch 'stable' into feature/12193-notify-if-32-bitintrigeri2017-03-052-17/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'stable' into feature/12193-notify-if-32-bitintrigeri2017-03-058-11/+21
| |\ \ \ \ \
| * | | | | | tails-*-notify-user scripts: start doc viewer in a subprocess.anonym2017-03-043-14/+20
| * | | | | | Merge branch 'stable' into feature/12193-notify-if-32-bitintrigeri2017-03-035-2/+82
| |\ \ \ \ \ \
| * | | | | | | tails-virt-notify-user: use the tails-documentation helper to improve UX when...intrigeri2017-03-031-2/+3
| * | | | | | | tails-32-bit-notify-user: display the local news, and a localized version if ...intrigeri2017-03-031-2/+2
| * | | | | | | tails-32-bit-notify-user: make decisions based on the CPU architecture, not t...intrigeri2017-03-022-4/+4
| * | | | | | | Merge remote-tracking branch 'origin/stable' into feature/12193-notify-if-32-bitintrigeri2017-03-023-15/+103
| |\ \ \ \ \ \ \
| * | | | | | | | Notify the user if running on a 32-bit processor, that won't be supported in ...intrigeri2017-01-303-0/+77
* | | | | | | | | Merge branch 'stable' into develintrigeri2017-03-052-17/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/feature/12283-tor-browser-6.5.1' into st...intrigeri2017-03-052-17/+17
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Upgrade Tor Browser to 6.5.1-build2.anonym2017-03-042-17/+17
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Revert "Enable the bugfix-12217-linux-4.8.15 APT overlay."intrigeri2017-03-051-0/+0
* | | | | | | | Revert "Freeze exception: install Linux 4.8.15 from our repo."intrigeri2017-03-051-10/+5
* | | | | | | | Merge branch 'stable' into develintrigeri2017-03-054-6/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/bugfix/12217-linux-4.8.15' into stable (...intrigeri2017-03-052-5/+10
| |\ \ \ \ \ \ \
| | * | | | | | | Freeze exception: install Linux 4.8.15 from our repo.anonym2017-03-041-5/+10
| | * | | | | | | Enable the bugfix-12217-linux-4.8.15 APT overlay.anonym2017-03-031-0/+0
| | |/ / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/stable' into stableanonym2017-03-054-5/+10
| |\ \ \ \ \ \ \
| * | | | | | | | Revert "Import tentative fix from iuk.git (refs: #8449, #11839)."anonym2017-03-051-15/+0
| * | | | | | | | Enable the bugfix-8449-iuk-install-robustness APT overlay.anonym2017-03-051-0/+0
| * | | | | | | | Import tentative fix from iuk.git (refs: #8449, #11839).intrigeri2017-03-031-0/+15
| * | | | | | | | Allow the tails-install-iuk user to run "/usr/bin/nocache /bin/cp *" as root ...intrigeri2017-03-031-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'stable' into develintrigeri2017-03-054-5/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Disable modules we blacklist for security reasons.anonym2017-03-033-5/+6
| * | | | | | | Disable modules for more uncommon network protocol.anonym2017-03-031-0/+3
| * | | | | | | Fix CVE-2017-6074 by disabling the 'dccp' module.anonym2017-03-031-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'stable' into develintrigeri2017-03-035-2/+82
|\ \ \ \ \ \ \ | |/ / / / / /