summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bugfix/firmware-nonfree-20151018-2' into develanonym2015-10-212-2/+7
|\
| * Install firmware-amd-graphics from Debian Sid.anonym2015-10-212-0/+5
| | | | | | | | | | It is a dependency for firmware-linux-nonfree since version 20151018-1.
| * Install firmware-misc-nonfree from Debian Sid instead of ↵anonym2015-10-212-2/+2
| | | | | | | | | | | | firmware-ralink-nonfree. The latter was merged into the former in firmware-nonfree 20151018-1.
* | Merge remote-tracking branch ↵anonym2015-10-141-0/+0
|\ \ | | | | | | | | | | | | | | | 'origin/feature/9672-rework-installer-wording-on-wheezy' into devel Fix-committed: #9672
| * | Add the feature-9672-rework-installer-wording-on-wheezy APT overlay.intrigeri2015-10-031-0/+0
| | |
* | | Fix typo.intrigeri2015-10-121-1/+1
| | |
* | | Revert "Fetch torbrowser-launcher source from Debian Sid."anonym2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8b828025c2b878986abbf4c42bb9d87d1cdbbbd. A fixed package is in Debian Testing now, so we can revert to using it as the source. Fix-committed: #10192
* | | Fix typo.anonym2015-10-051-1/+1
| | |
* | | Log Tor's bootstrapping status to syslog.anonym2015-10-031-0/+6
| | |
* | | Fix indentation.anonym2015-10-032-38/+38
| | |
* | | Don't use restart-tor when using a bridge.anonym2015-10-032-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | See added comment why we cannot do that. Also, while we're at it, let's move some code from 20-time.sh into here since that's where it belongs. Will-fix: #9516
* | | Restart Tor if bootstrapping stalls for more than 20 secondskytv2015-10-032-6/+45
|/ / | | | | | | Will-fix: #9516
* | Merge branch 'stable' into develintrigeri2015-09-219-4131/+6039
|\ \ | |/
| * Updating SquashFS sort file1.6anonym2015-09-201-3416/+3373
| |
| * Update AdBlock Plus patterns.anonym2015-09-201-697/+2636
| |
| * Empty the list of APT overlays: they were mergedanonym2015-09-201-0/+0
| |
| * Upgrade Tor Browser to 5.0.3.anonym2015-09-202-16/+16
| | | | | | | | Will-fix: #10223
| * Merge branch 'bugfix/8159-fix-download-management-page' into stablebertagaz2015-09-193-0/+12
| |\ | | | | | | | | | Fix-committed: #8159
| | * Merge remote-tracking branch 'origin/stable' into ↵bertagaz2015-09-194-24/+34
| | |\ | | | | | | | | | | | | bugfix/8159-fix-download-management-page
| | * \ Merge remote-tracking branch 'origin/stable' into ↵anonym2015-09-164-6/+23
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix/8159-fix-download-management-page Conflicts: config/chroot_local-includes/usr/share/tails/i2p-browser/prefs.js
| | * | | Fix the Download Management page in our browsers.anonym2015-09-093-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the browser.download.panel.shown pref set, the progress being made will not update until after the browser has been restarted (which is impossible for the Unsafe and I2P browsers). Will-fix: #8159
| * | | | Merge remote-tracking branch 'origin/stable' into ↵bertagaz2015-09-195-24/+37
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | bugfix/10182-improve-i2p-notification
| * | | | Refer to the I2P Browser in the I2P notifications.anonym2015-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of some obscure links that won't work in the Tor Browser, where users likely will try them, and which I believe will open them by default. Will-fix: #10182
* | | | | Merge branch 'stable' into develintrigeri2015-09-172-0/+22
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/stable' into stableintrigeri2015-09-172-0/+22
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/feature/i2p-0.9.22' into stableanonym2015-09-172-0/+22
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix-committed: #9830
| | | * | | | Add the feature-i2p-0.9.22 APT overlay.anonym2015-09-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Will-fix: #9830
| | | * | | | Remove 'i2prouter-nowrapper'kytv2015-09-151-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Like 'i2prouter', this script is also never used in Tails.
| | | * | | | Use dpkg-divert to prevent overwriting i2prouter on upgradekytv2015-09-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /usr/bin/i2prouter is not used in Tails so we replace it with a stub script. dpkg-divert will ensure that our custom script isn't overwritten if a user upgrades the I2P packages manually.
| | | * | | | Set the I2P apparmor profile to enforce modekytv2015-09-151-0/+4
| | | | |_|/ | | | |/| |
* | | | | | Merge branch 'stable' into develintrigeri2015-09-171-21/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch ↵intrigeri2015-09-171-21/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 'origin/bugfix/9146-remove-localized-search-plugin-workaround' into stable Fix-committed: #9146
| | * | | | Explain why we need to explicitly set general.useragent.locale.anonym2015-09-081-0/+3
| | | | | |
| | * | | | Remove workaround for localizing search engine plugins.anonym2015-09-081-21/+0
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround has recently become unnecessary, possibly due to the changes made for the seach bar after the Tor Browser was rebased on Firefox 38esr. Who knows? Who cares? Will-fix: #9146
* | | | | Merge branch 'stable' into develintrigeri2015-09-171-3/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch ↵intrigeri2015-09-161-3/+9
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | 'origin/bugfix/7689-fix-tails-restricted-network-detector' into stable Fix-committed: #7689
| | * | | Elaborate the comment for the "state transition" case.anonym2015-09-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The commit message that modified that case last wasn't particularly good, but this comment should make the situation clearer.
| | * | | Fix state recording in tails-restircted-network-detector.anonym2015-09-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Apparently NetworkManager can say a few different things when it logs the device state transitions.
| | * | | Avoid use of uninitialized value in restricted-network-detector.anonym2015-09-111-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If NetworkManager decides that a wireless connection has timed out before "supplicant connection state" has occued, our idea of the state is `undef`, so it cannot be used in a string comparison. Hence, let's initialize the state to the empty string instead of `undef`. Will-fix: #7689
* | | | Merge branch 'stable' into develintrigeri2015-09-151-0/+3
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch ↵anonym2015-09-141-0/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | 'kytv/bug/10184-do_not_set_hostname_prefix_or_suffix_in_I2PBrowser' into stable Fix-committed: #10184
| | * | Never add 'www' or \.(com|org|net) to URLs in I2P Browserkytv2015-09-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All I2P sites (with or without a hostname) end in `.i2p`, so this Firefox feature isn't at all helpful. I've never had this happen in Tails but I did see it a couple of times during the test suite.
* | | | Merge branch 'stable' into develanonym2015-09-142-5/+19
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/stable' into ↵bertagaz2015-09-131-1/+1
| |\ \ \ | | |/ / | | | | | | | | bugfix/10160-mac-spoofing-panic
| * | | Rename services/binaries to disable them instead of removing.anonym2015-09-131-1/+3
| | | |
| * | | Fix a corner case for the MAC spoofing panic mode.anonym2015-09-042-5/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If panic mode failed to disable the specific device that couldn't be spoofed (by unloading the module) we disable networking. Previously we only stopped NetworkManager. The problem is that NM isn't even started at this time, but will specifically be started when we're done with MAC spoofing. Therefore, let's remove NetworkManager so it cannot possibly be started. Will-fix: #10160
* | | Merge branch 'stable' into develanonym2015-09-121-1/+1
|\ \ \ | | |/ | |/|
| * | Fetch torbrowser-launcher source from Debian Sid.anonym2015-09-121-1/+1
| |/ | | | | | | It was autoremoved from Debian Testing due to the Debian bugs:
* | Merge remote-tracking branch 'origin/master' into develintrigeri2015-08-293-837/+1755
|\ \ | |/
| * Update AdBlock Plus patterns.anonym2015-08-281-821/+1739
| |