summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* config/chroot_local-packageslists/tails-common.list: add gnome-sound-recorderbugfix/10950-add-gnome-sound-recorderAustin English2017-03-221-0/+4
|
* Merge branch 'stable' into develanonym2017-03-201-2/+2
|\
| * Test suite: fixup on possible fix for #11508.anonym2017-03-201-2/+2
| | | | | | | | Apparently PacketFu can raise NameError too, yay.
* | Merge branch 'stable' into develanonym2017-03-191-10/+13
|\ \ | |/
| * Test suite: try possible fix for #11508.anonym2017-03-191-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yup, it seems that all along I've just missed that we could have IPv6Packet:s in `ip_packet`, and their source is accessed by `.ipv6_saddr`, not `ip_saddr` (that's for IPv4Packet). So, let's just try and see which one of the two each `ip_packet` has, because one of them must be there! Also, given that UDPPacket can be either IPv4 or IPv6 it seems safest to try to parse each packet as IPv6Packet first -- that way we keep looking at transport layer protocols for IPv4 only, and treat everything IPv6 as the same, which makes sense, since we should block all IPv6, so everything should be treated the same at all times. Refs: #11508
* | Merge branch 'stable' into develanonym2017-03-191-4/+7
|\ \ | |/
| * Test suite: refine debug info collection of #11508.anonym2017-03-191-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | I have seen yet another: NoMethodError: undefined method `ip_saddr' for nil:NilClass So we now know that `ip_packet` is not `nil`, it just doesn't have the `ip_saddr` method (and probably not the `ip_daddr` one either) some how (feels strange for an IP packet to not have a source or destination address...). Refs: #11508
* | Merge remote-tracking branch 'origin/devel' into develintrigeri2017-03-153-12/+9
|\ \
| * \ Merge remote-tracking branch 'origin/stable' into develanonym2017-03-131-8/+8
| |\ \
| * \ \ Merge remote-tracking branch 'origin/feature/12051-ikiwiki-from-Debian' into ↵anonym2017-03-133-12/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | devel Fix-committed: #12051
| | * | | Install ikiwiki from jessie-backports, instead of our patched one (refs: ↵intrigeri2017-03-133-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #12051). Our changes were merged in 3.20161219, and jessie-backports now has 3.20170111~bpo8+1.
* | | | | Merge branch 'stable' into develintrigeri2017-03-1513-34/+103
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'origin/stable' into stableintrigeri2017-03-151-8/+8
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Test suite: fixup on debugging info logging for PacketFu.anonym2017-03-131-8/+8
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | We still get "undefined method `ip_saddr' for nil:NilClass" because another instance of `ip_packet.ip_saddr` was forgotten and not dealt with. Refs: #11508
| * | | Rakefile: fix exported variable name.intrigeri2017-03-151-1/+1
| | | | | | | | | | | | | | | | There's no such thing as $TAILS_OFFLINE_BUILD.
| * | | Merge remote-tracking branch 'origin/master' into stableintrigeri2017-03-1511-25/+94
| |\ \ \
| | * | | (no commit message)127.0.0.12017-03-141-14/+12
| | | | |
| | * | | (no commit message)127.0.0.12017-03-141-24/+22
| | | | |
| | * | | Link Code of Conduct and Social Contract togethersajolida2017-03-142-1/+4
| | | | |
| | * | | Merge remote-tracking branch 'origin/master'sajolida2017-03-142-5/+27
| | |\ \ \
| | | * | | (no commit message)127.0.0.12017-03-141-0/+2
| | | | | |
| | | * | | (no commit message)127.0.0.12017-03-141-1/+13
| | | | | |
| | | * | | translate.vm updates127.0.0.12017-03-141-4/+12
| | | | | |
| | * | | | Use the official name of the Tor Social Contractsajolida2017-03-131-1/+1
| | |/ / / | | | | | | | | | | | | | | | https://blog.torproject.org/blog/tor-social-contract
| | * | | Add note of preventing spamsajolida2017-03-131-0/+8
| | | | |
| | * | | Add note about backupssajolida2017-03-131-0/+7
| | | | |
| | * | | Add data source for personassajolida2017-03-131-0/+6
| | | | |
| | * | | Add data source for personassajolida2017-03-131-2/+7
| | | | |
| | * | | Add notes about research plans for VeraCryptsajolida2017-03-131-0/+10
| | | | |
| | * | | Add data source for personassajolida2017-03-131-0/+9
| | | | |
| | * | | Add RTIRsajolida2017-03-131-0/+3
| | | | |
| | * | | Be more personalsajolida2017-03-131-3/+3
| | | | |
| | * | | Create blueprint for Portuguese teamsajolida2017-03-131-0/+0
| | | | |
* | | | | Merge branch 'stable' into develintrigeri2017-03-1318-115/+358
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'origin/master' into stableintrigeri2017-03-1318-115/+358
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2017-03-137-0/+125
| | |\
| | | * Merge remote-tracking branch '451f/feature/11987+remove_ikiwiki_timestamps' ↵intrigeri2017-03-132-0/+81
| | | |\ | | | | | | | | | | | | | | | (Closes: #11987)
| | | | * Adding templates from latest ikiwiki versionUlrike Uhlig2017-03-132-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using templates from ikiwiki version 3.20170111. Modify these templates simply to exlude the parts which generate the "Posted" timestamps.
| | | * | Add UDF:s for Tails 2.11.1.anonym2017-03-134-0/+42
| | | | | | | | | | | | | | | | | | | | Fix-committed: #12326
| | | * | Add Icecast to the wish list127.0.0.12017-03-131-0/+2
| | | | |
| | * | | Including sajolidas remarksUlrike Uhlig2017-03-131-4/+4
| | | |/ | | |/|
| | * | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2017-03-13217-4245/+11332
| | |\ \ | | | |/
| | | * Revert spam.intrigeri2017-03-131-1/+0
| | | | | | | | | | | | | | | | This reverts commit edef3ce1554369261a6af9f3676e582dec24044f.
| | | * (no commit message)127.0.0.12017-03-121-0/+1
| | | |
| | | * Merge remote-tracking branch 'xin/translate/known_issues'intrigeri2017-03-121-9/+8
| | | |\
| | | | * [fr] update translationxin2017-03-121-9/+8
| | | | |
| | | * | (no commit message)127.0.0.12017-03-121-4/+10
| | | |/
| | | * Cleanup.intrigeri2017-03-121-5/+1
| | | |
| | | * Merge remote-tracking branch 'xin/translate/3.0beta2'intrigeri2017-03-121-37/+78
| | | |\
| | | | * [fr] update translationxin2017-03-091-37/+78
| | | | |