aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-09Merge remote-tracking branch 'tor-github/pr/862'teor
2019-04-06practracker: accept 6 extra lines in tortls_nss.c:tor_tls_context_new()teor
These lines were added to fix bug 29241.
2019-04-06Merge branch 'maint-0.4.0'teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0teor
2019-04-06changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alphateor
2019-04-06NSS: disable TLS1.2 SHA-384 ciphersuites.Nick Mathewson
In current NSS versions, these ciphersuites don't work with SSL_ExportKeyingMaterial(), which was causing relays to fail when they tried to negotiate the v3 link protocol authentication. Fixes bug 29241; bugfix on 0.4.0.1-alpha.
2019-04-06NSS: Log an error message when SSL_ExportKeyingMaterial() failsNick Mathewson
Diagnostic for 29241.
2019-04-06Merge branch 'maint-0.4.0'teor
2019-04-06Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-04-06Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-06Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9teor
2019-04-05practracker: allow config.c to be a touch larger.Nick Mathewson
2019-04-05Merge branch 'tor-github/pr/907'George Kadianakis
2019-04-05Merge branch 'tor-github/pr/906' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'maint-0.4.0'George Kadianakis
2019-04-05Merge branch 'tor-github/pr/901' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'maint-0.4.0'George Kadianakis
2019-04-05Merge branch 'tor-github/pr/879' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'maint-0.4.0'George Kadianakis
2019-04-05Merge branch 'tor-github/pr/902' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'tor-github/pr/761'George Kadianakis
2019-04-05Merge branch 'maint-0.4.0'George Kadianakis
2019-04-05Merge branch 'tor-github/pr/800' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'bug29036-29962-034' into bug29036-29962-035teor
2019-04-05Merge branch 'bug29036-029' into bug29036-29962-034teor
2019-04-05Makefile: actually, don't delete the gcno filesteor
We need to keep the gcno files, because they are created at compile time.
2019-04-05Merge branch 'bug29500_040_monoinit_revert' into bug29500_master_monoinitteor
Apply data structure changes between 0.4.0 and 0.4.1.
2019-04-05Revert "test/circuitpadding: Delete circuitpadding_circuitsetup_machine()"teor
This reverts commit 387d9448de4c5044800706b4ed21b48b4426cb7e.
2019-04-05circuitpadding: comment fixesteor
2019-04-05test/circuitpadding: Delete circuitpadding_circuitsetup_machine()teor
This test was disabled in 0.4.0 and later, but the fix in #29298 was only merged to 0.4.1. So this test will never be re-enabled in 0.4.0. Part of 29500.
2019-04-05Bug #29500: Fix monotime mocking in circpad unittests.Mike Perry
Our monotime mocking forces us to call monotime_init() *before* we set the mocked time value. monotime_init() thus stores the first ratchet value at whatever the platform is at, and then we set fake mocked time to some later value. If monotime_init() gets a value from the host that is greater than what we choose to mock time at for our unittests, all subsequent monotime_abosolute() calls return zero, which breaks all unittests that depend on time moving forward by updating mocked monotime values. So, we need to adjust our mocked time to take the weird monotime_init() time into account, when we set fake time.
2019-04-05Changes file for bug 29500.Mike Perry
2019-04-05Bug 29500: Start monotime at 1000 nsec.Mike Perry
Hopefully this will stop monotime_absolute_usec() from returning 0 on some platforms in the tests.
2019-04-05Bug 29500: Attempt to fix the tokens test.Mike Perry
Cancel the padding timer by changing order of sent vs recv (sent cancels).
2019-04-04Merge remote-tracking branch 'tor-github/pr/752'Nick Mathewson
2019-04-04Merge branch 'maint-0.4.0'Nick Mathewson
2019-04-04Merge branch 'bug29959_040_squashed' into maint-0.4.0Nick Mathewson
2019-04-04bwauth: Actually include the bandwidth-file-digest in authority votesteor
Fixes bug 29959; bugfix on 0.4.0.2-alpha.
2019-04-04Use an enum for inherit_result_out.Nick Mathewson
2019-04-04Syntax fix in test.Nick Mathewson
2019-04-04rename inherit values to avoid conflict with system definesNick Mathewson
2019-04-04fast_rng: if noinherit has failed, then check getpid() for bad forksNick Mathewson
getpid() can be really expensive sometimes, and it can fail to detect some kind of fork+prng mistakes, so we need to avoid it if it's safe to do so. This patch might slow down fast_prng a lot on any old operating system that lacks a way to prevent ram from being inherited, AND requires a syscall for any getpid() calls. But it should make sure that we either crash or continue safely on incorrect fork+prng usage elsewhere in the future.
2019-04-04map_anon: define a macro if it is possible for noinherit to fail.Nick Mathewson
2019-04-04Make map_anon expose the result of a noinherit attemptNick Mathewson
Previously we did this for tests only, but it's valuable for getting proper fork behavior in rand_fast.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion