summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/devel' into test/10442-watching-webm-ove...test/10442-watching-webm-over-https-is-fragileintrigeri2016-08-24391-28898/+10591
|\
| * Merge remote-tracking branch 'origin/feature/from-intrigeri-for-2.6' into develanonym2016-08-2389-15604/+446
| |\
| | * Merge branch 'test/10971-more-CPUs-for-TailsToaster+11588+10733' into feature...intrigeri2016-08-232-1/+12
| | |\
| | | * Merge branch 'test/11588-usb-on-jenkins+10733' into test/10971-more-CPUs-for-...intrigeri2016-08-231-0/+2
| | | |\
| | | * \ Merge branch 'test/10971-more-CPUs-for-TailsToaster' into test/10971-more-CPU...intrigeri2016-08-0871-697/+1045
| | | |\ \
| | | | * \ Merge remote-tracking branch 'origin/devel' into test/10971-more-CPUs-for-Tai...intrigeri2016-08-08317-13385/+10262
| | | | |\ \
| | | * | \ \ Merge branch 'test/11588-usb-on-jenkins+10733' into test/10971-more-CPUs-for-...intrigeri2016-08-08260-12722/+9233
| | | |\ \ \ \
| | | * | | | | Revert "Revert "Test suite: give the system under testing 2 vCPUs.""intrigeri2016-07-311-1/+1
| | | * | | | | Merge branch 'test/11588-usb-on-jenkins+10733' into test/10971-more-CPUs-for-...intrigeri2016-07-3021-79/+91
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge remote-tracking branch 'origin/stable' into test/10971-more-CPUs-for-Ta...intrigeri2016-07-2321-56/+120
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into test/10971-more-CPUs-for-Ta...intrigeri2016-07-13511-17326/+7447
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/testing' into test/10971-more-CPUs-for-T...anonym2016-06-08159-8898/+15070
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Revert "Disable WebM test since the feature is broken in the Tor Browser."anonym2016-06-061-0/+11
| | | * | | | | | | | Merge remote-tracking branch 'origin/testing' into test/10971-more-CPUs-for-T...anonym2016-06-06214-6031/+10033
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'test/10497-tor-bootstrap-is-fragile' into test/10971-more-CPUs-...intrigeri2016-05-2711-31/+31
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into test/10971-more-CPUs-for-Tai...intrigeri2016-05-23409-2578/+53210
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'test/10497-tor-bootstrap-is-fragile' into test/10971-more-CPUs-...intrigeri2016-05-217-4/+15
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'test/10497-tor-bootstrap-is-fragile' into test/10971-more-CPUs-...intrigeri2016-05-1921-48/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into test/10971-more-CPUs-for-Tai...intrigeri2016-05-17527-20547/+12462
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into test/10971-more-CPUs-for-Tai...intrigeri2016-05-141134-34490/+40003
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into test/10971-more-CPUs-for-Ta...intrigeri2016-02-261150-100357/+23308
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'devel' into test/10971-more-CPUs-for-TailsToasterintrigeri2016-01-26305-7588/+11277
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'test/11588-usb-on-jenkins+10733' into feature/from-intrigeri-fo...intrigeri2016-08-231-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'stable' into test/11588-usb-on-jenkins+10733intrigeri2016-08-2351-235/+900
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'feature/10298-linux-4.x-aufs-kaslr' into feature/from-intrigeri...intrigeri2016-08-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'feature/10298-linux-4.x-aufs' into feature/10298-linux-4.x-aufs...intrigeri2016-08-141-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Test suite: take into account that we see less of the total memory, so the re...intrigeri2016-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'feature/10298-linux-4.x-aufs-kaslr' and 'feature/10190-OpenPG...intrigeri2016-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into feature/10190-OpenPGP-applet...intrigeri2016-08-08775-29920/+17229
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'feature/10298-linux-4.x-aufs' into feature/10298-linux-4.x-aufs...intrigeri2016-08-08309-13285/+10134
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into feature/10298-linux-4.x-aufsintrigeri2016-08-08309-13285/+10134
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into feature/from-intrigeri-for-2.6intrigeri2016-08-0854-535/+898
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'test/11588-usb-on-jenkins+10733' into feature/from-intrigeri-fo...intrigeri2016-08-022-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'stable' into test/11588-usb-on-jenkins+10733intrigeri2016-08-02260-12722/+9233
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | *-------. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branches 'origin/feature/5650-rngd', 'origin/feature/10...intrigeri2016-08-0195-15658/+448
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / / / / / / / / / / / | | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | | | |/| | | | | | / / / / / / / / / / / / / / / | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | | | Merge branch 'test/11588-usb-on-jenkins' into test/11588-usb-on-jenkins+10733intrigeri2016-07-301-2/+2
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | | | Test suite: take into account that only 3040 MiB of RAM is detected since we ...intrigeri2016-07-301-2/+2
| | | | | | | * | | | | | | | | | | | | | | | | | | Merge branch 'bugfix/10733-run-memory-erasure-hook-earlier' into test/11588-u...intrigeri2016-07-294-5/+16
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/stable' into bugfix/10733-run-memory-era...intrigeri2016-07-192-11/+4
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into bugfix/10733-run-memory-era...intrigeri2016-07-15527-17548/+13875
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/testing' into bugfix/10733-run-memory-er...intrigeri2016-06-07243-11099/+11829
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | Update design doc.intrigeri2016-06-011-1/+2
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'test/10776-fragile-memory_wipe' into bugfix/10733-run-memory-er...intrigeri2016-06-011-4/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into test/10776-fragile-memory_wipeintrigeri2016-06-012322-150475/+119714
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'devel' into test/10776-fragile-memory_wipeintrigeri2016-01-26195-6661/+9275
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/testing' into test/10776-fragile-memory_...intrigeri2016-01-251034-6041/+94207
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | Revert "Test suite: mark scenarios that wipe memory as fragile."intrigeri2015-12-181-4/+0
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Add memory_wipe to the prereqs of all init-top initramfs scripts that are not...intrigeri2016-06-011-0/+14
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Run our initramfs memory erasure hook earlier.intrigeri2016-06-011-0/+0
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Test suite: update setup doc to pull QEMU from jessie-backports.intrigeri2016-07-291-2/+4