summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use the real meek for Moat (refs: #15331)wip/feature/15331-moatintrigeri2019-08-111-3/+3
* Create directory needed for Moat (refs: #15331)intrigeri2019-08-111-0/+3
* Use the same extensions.torlauncher.default_bridge_recommended_type as upstream.intrigeri2019-08-111-1/+1
* Add explanatory comment (refs: #15331).intrigeri2019-08-111-0/+1
* Adjust Moat prefs extraction to paths used in current Tor Browser (refs: #153...intrigeri2019-08-111-3/+7
* WIP: real meek for moatanonym2019-08-113-0/+7
* Tor Launcher: provide Tor's default Meek bridges.anonym2019-08-111-0/+10
* Fix update-acng-config to generate rules for Tails 4 and 5.anonym2019-08-101-1/+1
* Merge branch 'stable' into develintrigeri2019-08-101-3/+15
|\
| * Merge branch 'test/16825-ignore-rarp' into stableintrigeri2019-08-101-3/+15
| |\
| | * Merge branch 'stable' into test/16825-ignore-rarpintrigeri2019-08-103042-34644/+437627
| | |\ | | |/ | |/|
| | * Test suite: ignore RARP packets.anonym2019-06-191-3/+15
* | | Fix typo.intrigeri2019-08-101-1/+1
* | | Merge branch 'feature/buster' into develsajolida2019-08-091-12/+5
|\ \ \
| * | | Traverso was removed in 3.14sajolida2019-08-061-7/+0
| * | | Fix typossajolida2019-08-061-5/+5
* | | | Improve comment.anonym2019-08-091-6/+5
* | | | Merge remote-tracking branch 'origin/bugfix/16941-torbrowser-launcher-0.3.2+f...anonym2019-08-091-146/+33
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/devel' into bugfix/16941-torbrowser-laun...bugfix/16941-torbrowser-launcher-0.3.2+force-all-testsintrigeri2019-08-0862-2500/+2578
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'stable' into develintrigeri2019-08-0854-2476/+2520
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'origin/bugfix/16601-fix-translations' into stab...intrigeri2019-08-0854-2478/+2525
| |\ \ \ \
| | * | | | Update POT and PO files.segfault2019-08-0550-2470/+2523
| | * | | | ASP: Make window title translatable (refs: #16601)segfault2019-08-051-1/+1
| | * | | | ASP: Set gettext domain to "tails" in confguration-window.ui (refs #16601)segfault2019-08-051-1/+1
| | * | | | Merge branch 'stable' into bugfix/16601-fix-translationssegfault2019-08-043325-59204/+459064
| | |\ \ \ \
| | * | | | | ASP: fix tranlsationAlan2019-04-053-6/+0
* | | | | | | Merge branch 'stable' into develintrigeri2019-08-075-0/+42
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2019-08-075-0/+42
| |\ \ \ \ \ \
| | * | | | | | Update the pythonlib submodule.intrigeri2019-08-071-0/+0
| | * | | | | | Fixup UDFs for 4.0~beta1.anonym2019-08-074-28/+28
| | * | | | | | Add UDFs for Tails 4.0~beta1.anonym2019-08-074-0/+42
* | | | | | | | Merge remote-tracking branch 'origin/devel' into develintrigeri2019-08-07300-6947/+8020
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge branch 'stable' into develintrigeri2019-08-07555-20344/+19872
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2019-08-07555-20344/+19872
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Update the pythonlib submodule: feature/buster was merged into devel.intrigeri2019-08-071-0/+0
| | * | | | | | If we release a 3.17 it'll be a bugfix release.intrigeri2019-08-071-1/+1
| | * | | | | | merge Weblate changes using merge_weblate_changes.py.Tails translators2019-08-072-23/+15
| | |\ \ \ \ \ \
| | | * | | | | | Translated using Weblate (French)emmapeel2019-08-071-4/+6
| | | * | | | | | Weblate commitanonymous2019-08-071-18/+8
| | | * | | | | | Weblate commitJoaquín Serna2019-08-071-3/+3
| | | | | | * | | Tor Browser AppArmor profile: update patch to apply on top of 0.3.2-1 (refs: ...intrigeri2019-08-071-146/+33
| | | | | |/ / / | | | | |/| | |
| | | | * | | | Empty the list of APT overlays: they were mergedanonym2019-08-071-0/+0
| | | | * | | | Merge remote-tracking branch 'origin/feature/buster' into develanonym2019-08-07854-27274/+27883
| | | | |\ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| | | | * | | | Merge remote-tracking branch 'origin/master' into feature/busterfeature/busteranonym2019-08-07554-20327/+19863
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | / / | | | | | |/ / | | | | |/| |
| | * | | | | Switch RMs.intrigeri2019-08-061-1/+1
| | |/ / / /
| | * | | | Translated using Weblate (Spanish)anonymous2019-08-051-2/+5
| | * | | | Translated using Weblate (Spanish)Joaquín Serna2019-08-051-5/+5
| | * | | | ikiwiki-cgi.setup: point history & diff URLs to Salsa.intrigeri2019-08-051-2/+2
| | * | | | Consistently suggest forking us on Salsa.intrigeri2019-08-053-3/+3
| | * | | | Roadmap: mark 2 completed items as such.intrigeri2019-08-051-2/+2