summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-26Merge branch 'tor-github/pr/611'George Kadianakis
2019-02-25Merge remote-tracking branch 'tor-github/pr/684'Nick Mathewson
2019-02-24Merge remote-tracking branch 'tor-github/pr/646'Nick Mathewson
2019-02-24Merge branch 'ticket29065_squashed'Nick Mathewson
2019-02-24Fix shellcheck SC2006 warnings in test_switch_id.shrl1987
2019-02-22Merge remote-tracking branch 'nickm/thread_rng'George Kadianakis
2019-02-21Merge branch 'maint-0.4.0'Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.4.0.2-alpha-devNick Mathewson
2019-02-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.3.5.8-devNick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.3.4.11-devNick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"ours" to avoid version bump
2019-02-21Bump to 0.3.3.12-devNick Mathewson
2019-02-21Remove changes entries for fixes that appeared in 0.4.0.2-alphaNick Mathewson
2019-02-21Copy today's releases into changelogs and releasenotes.Nick Mathewson
2019-02-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Merge branch 'maint-0.4.0'Nick Mathewson
2019-02-21kist: Don't write above the highwater outbuf markDavid Goulet
KIST works by computing how much should be allowed to write to the kernel for a given socket, and then it writes that amount to the outbuf. The problem is that it could be possible that the outbuf already has lots of data in it from a previous scheduling round (because the kernel is full/busy and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf has been filling (is above its "highwater") and writes more anyway. The end result is that the outbuf length would exceed INT_MAX, hence causing an assertion error and a corresponding "Bug()" message to get printed to the logs. This commit makes it for KIST to take into account the outbuf length when computing the available space. Bug found and patch by Rob Jansen. Closes #29168. TROVE-2019-001. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21Merge branch 'maint-0.4.0'Nick Mathewson
"ours" to avoid version bump
2019-02-21Bump version to 0.4.0.2-alphaNick Mathewson
2019-02-21Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.3.5.8Nick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" to avoid version bump.
2019-02-21Bump to 0.3.4.11Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Update to 0.3.3.12Nick Mathewson
2019-02-21Merge branch 'maint-0.4.0'Nick Mathewson
2019-02-21Fix a goofy change from abcde10fce that broke test-slow linkingNick Mathewson
boklm tracked this down, and it doesn't make sense. It caused This change goes back to the previous LDFLAGS line.
2019-02-20Merge branch 'tor-github/pr/695'David Goulet
2019-02-20Merge branch 'tor-github/pr/658'David Goulet
2019-02-20Merge branch 'tor-github/pr/687'David Goulet
2019-02-20Merge branch 'tor-github/pr/700'David Goulet
2019-02-20Use setrlimit instead of ulimit -c in backtrace testsrl1987
2019-02-20Merge branch 'tor-github/pr/675'David Goulet
2019-02-20Merge branch 'tor-github/pr/696'David Goulet
2019-02-20Merge branch 'maint-0.4.0'Roger Dingledine
2019-02-20Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0Roger Dingledine
2019-02-20Merge branch 'maint-0.4.0'Roger Dingledine
2019-02-20Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0Roger Dingledine
2019-02-20fix typos from #28614Roger Dingledine
2019-02-19Add a quick test for get_thread_fast_rng()Nick Mathewson
2019-02-19Implement code to manage a per-thread instance of crypto_fast_rng()Nick Mathewson
The subsystems API makes this really simple, fortunately. Closes ticket 29536
2019-02-19Downgrade some LOG_ERR messages in the address/* tests to warningsNick Mathewson
Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Bug not in any released Tor.
2019-02-19Mark map_anon_nofork test as skipped in 0.4.0Nick Mathewson
This test fails in some environments; since the code isn't used in 0.4.0, let's disable it for now. Band-aid solution for #29534; bug not in any released Tor.
2019-02-19Merge remote-tracking branch 'tor-github/pr/665'Nick Mathewson
2019-02-19Merge remote-tracking branch 'tor-github/pr/659'Nick Mathewson
2019-02-19Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion