aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)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
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
2019-04-06NSS: Log an error message when SSL_ExportKeyingMaterial() failsNick Mathewson
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
2019-04-05Merge branch 'bug29500_040_monoinit_revert' into bug29500_master_monoinitteor
2019-04-05Revert "test/circuitpadding: Delete circuitpadding_circuitsetup_machine()"teor
2019-04-05circuitpadding: comment fixesteor
2019-04-05test/circuitpadding: Delete circuitpadding_circuitsetup_machine()teor
2019-04-05Bug #29500: Fix monotime mocking in circpad unittests.Mike Perry
2019-04-05Changes file for bug 29500.Mike Perry
2019-04-05Bug 29500: Start monotime at 1000 nsec.Mike Perry
2019-04-05Bug 29500: Attempt to fix the tokens test.Mike Perry
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
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
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