summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Tor Launcher: provide Tor's default Meek bridges.feature/8825-default-meek-bridgesanonym2018-01-262-1/+10
* Tor Browser: get rid of all Tor Launcher prefs.anonym2018-01-261-2/+3
* Design: document tor's new DNS configuration.anonym2018-01-262-8/+27
* Tor: add support for meek_lite.anonym2018-01-261-1/+1
* Rearrange Tor's ferm rules vs the LAN rules.anonym2018-01-261-6/+6
* Tor: enable clearnet DNS resolution in bridge mode.anonym2018-01-264-2/+25
* Keep clearnet DNS server configured /etc/resolv-over-clearnet.conf.anonym2018-01-264-53/+35
* Fix incorrect path to make Tor Launcher reappear as intended.anonym2018-01-261-1/+1
* Merge branch 'stable' into develanonym2018-01-23106-1437/+3774
|\
| * Revert "Revert "Add dummy changelog entry for 3.5.1.""anonym2018-01-231-0/+6
| * Merge branch 'master' into stableanonym2018-01-231-6/+0
| |\
| | * Revert "Add dummy changelog entry for 3.5.1."anonym2018-01-231-6/+0
| |/
| * Merge remote-tracking branch 'origin/master' into stableanonym2018-01-2365-1186/+1872
| |\
| | * updated PO filesamnesia2018-01-235-81/+64
| | * Merge remote-tracking branch 'origin/master'sajolida2018-01-2330-243/+741
| | |\
| | | * updated PO filesamnesia2018-01-235-19/+152
| | | * Merge branch 'master' of ssh://webmasters.boum.org//home/webmasters/boum.org/...amnesia2018-01-231-3/+8
| | | |\
| | | * | updated PO filesamnesia2018-01-2330-224/+589
| | * | | Merge remote-tracking branch 'cbrownstein/doc/15100-obsolete-usb-cannot-start'sajolida2018-01-231-8/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/15100-ob...Cody Brownstein2018-01-05220-3267/+438
| | | |\ \
| | | * | | Fix numberingCody Brownstein2018-01-021-3/+3
| | | * | | Remove obsolete warning (closes: #15100)Cody Brownstein2018-01-021-5/+0
| | * | | | Merge remote-tracking branch 'cbrownstein/doc/15137-break-your-security'sajolida2018-01-231-3/+8
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Explain better "break your security"Cody Brownstein2017-12-311-3/+8
| | * | | | Adjust bridge configuration to new Tails Greetersajolida2018-01-231-7/+6
| | * | | | Adjust alt to new Tails Greetersajolida2018-01-233-3/+3
| | * | | | Merge remote-tracking branch 'cbrownstein/doc/14790-update-doc-new-greeter' i...sajolida2018-01-232-14/+16
| | |\ \ \ \
| | | * | | | Revise instructions for new Tails GreeterCody Brownstein2018-01-171-6/+6
| | | * | | | Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/14790-up...Cody Brownstein2018-01-171003-60243/+501160
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/14790-up...Cody Brownstein2017-11-1633-300/+1657
| | | |\ \ \ \ \
| | | * | | | | | Revise instructions for new Tails GreeterCody Brownstein2017-11-141-8/+10
| | * | | | | | | Add incremental upgrades on the test channel for Tails 3.5anonym2018-01-236-40/+76
| | * | | | | | | refs #12035 I thought I had deleted this already, but it looks like something...Ulrike Uhlig2018-01-231-3/+0
| | * | | | | | | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-01-235-455/+664
| | |\ \ \ \ \ \ \
| | | * | | | | | | updated PO filesamnesia2018-01-235-455/+664
| | * | | | | | | | Let's not pretend that images are links. refs #14822Ulrike Uhlig2018-01-231-1/+0
| | |/ / / / / / /
| | * | | | | | | Remove links of previous partners. Only current partners shall be linked to. ...Ulrike Uhlig2018-01-231-27/+27
| | * | | | | | | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-01-235-46/+23
| | |\ \ \ \ \ \ \
| | | * | | | | | | updated PO filesamnesia2018-01-235-46/+23
| | * | | | | | | | Publish final report on MOSS projectUlrike Uhlig2018-01-232-0/+245
| | |/ / / / / / /
| | * | | | | | | refs: #14878 Delete note about switch to CCT.Ulrike Uhlig2018-01-231-4/+0
| | * | | | | | | Merge branch 'feature/12035+teardown'Ulrike Uhlig2018-01-236-251/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of webmasters.boum.org:wiki into feature/12035+teardownUlrike Uhlig2018-01-2347-341/+327
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into feature/12035+teardownUlrike Uhlig2018-01-2210-19/+0
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Delete donation campaign 2017 banner, translations, CSS & CSS importUlrike Uhlig2018-01-226-251/+0
| | | * | | | | | | | | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-01-2216-248/+283
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-01-2347-341/+327
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | / / / / / / / | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Updating trace file after uploading 3.5.anonym2018-01-231-1/+1
| | | * | | | | | | | | Remove incorrect point from iteration 2127.0.0.12018-01-221-4/+0
| * | | | | | | | | | | releasing version 3.5anonym2018-01-2318-188/+1648