aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-05PerConnBW{Rate,Burst} docs: do not say consensus param is always setNick Mathewson
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were introduced.
2018-03-19Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-19Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-19Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson
2018-03-19Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5Nick Mathewson
2018-03-19Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2Nick Mathewson
2018-03-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-13Merge branch 'maint-0.2.5' into maint-0.2.9Nick Mathewson
2018-03-13Update geoip and geoip6 to the March 8 2018 database.Karsten Loesing
2018-03-13Merge branch 'bug25474_032' into maint-0.3.2Nick Mathewson
2018-03-13Add a missing prototype to our libevent configure stanza.Nick Mathewson
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
2018-03-08changes: Fix changes file for bug25450.Isis Lovecruft
It didn't like me insulting my patch, I guess.
2018-03-08test: Increase time limit for IP creation in an HS test.Isis Lovecruft
This should avoid most intermittent test failures on developer and CI machines, but there could (and probably should) be a more elegant solution. Also, this test was testing that the IP was created and its expiration time was set to a time greater than or equal to `now+INTRO_POINT_LIFETIME_MIN_SECONDS+5`: /* Time to expire MUST also be in that range. We add 5 seconds because * there could be a gap between setting now and the time taken in * service_intro_point_new. On ARM, it can be surprisingly slow... */ tt_u64_op(ip->time_to_expire, OP_GE, now + INTRO_POINT_LIFETIME_MIN_SECONDS + 5); However, this appears to be a typo, since, according to the comment above it, adding five seconds was done because the IP creation can be slow on some systems. But the five seconds is added to the *minimum* time we're comparing against, and so it actually functions to make this test *more* likely to fail on slower systems. (It should either subtract five seconds, or instead add it to time_to_expire.) * FIXES #25450: https://bugs.torproject.org/25450
2018-03-03bump version to 0.3.2.10-devNick Mathewson
2018-03-03Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
"ours" merge to avoid version bump
2018-03-03version bump to 0.3.1.10-devNick Mathewson
2018-03-03Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2018-03-03Bump version to 0.2.9.15-devNick Mathewson
2018-03-01version bump to 0.3.2.10Nick Mathewson
2018-03-01Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
"ours" to avoid version bump.
2018-03-01Update to 0.3.1.10Nick Mathewson
2018-03-01Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2018-03-01version bump to 0.2.9.15Nick Mathewson
2018-03-01Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-01Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-01Protover tests: disable some obsoleted testsNick Mathewson
These were meant to demonstrate old behavior, or old rust behavior. One of them _should_ work in Rust, but won't because of implementation details. We'll fix that up later.
2018-03-01Spec conformance on protover: always reject ranges where lo>hiNick Mathewson
2018-03-01Forbid UINT32_MAX as a protocol versionNick Mathewson
The C code and the rust code had different separate integer overflow bugs here. That suggests that we're better off just forbidding this pathological case. Also, add tests for expected behavior on receiving a bad protocol list in a consensus. Fixes another part of 25249.
2018-03-01Forbid "-0" as a protocol version.Nick Mathewson
Fixes part of 24249; bugfix on 0.2.9.4-alpha.
2018-03-01Add more of Teor's protover tests.Nick Mathewson
These are as Teor wrote them; I've disabled the ones that don't pass yet, with XXXX comments.
2018-03-01Add some protover vote round-trip tests from Teor.Nick Mathewson
I've refactored these to be a separate function, to avoid tricky merge conflicts. Some of these are disabled with "XXXX" comments; they should get fixed moving forward.
2018-03-01Add another NULL-pointer fix for protover.c.Nick Mathewson
This one can only be exploited if you can generate a correctly signed consensus, so it's not as bad as 25074. Fixes bug 25251; also tracked as TROVE-2018-004.
2018-03-01Correctly handle NULL returns from parse_protocol_list when voting.Nick Mathewson
In some cases we had checked for it, but in others we had not. One of these cases could have been used to remotely cause denial-of-service against directory authorities while they attempted to vote. Fixes TROVE-2018-001.
2018-03-01Document how to allow partial Travis failuresTaylor Yu
Add some commented-out allow_failures clauses to make it easier to temporarily allow less-critical sub-builds to fail while still reporting success.
2018-02-21Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-21Update the .gitmodules to refer to project-level tor-rust-dependenciesNick Mathewson
Closes most of #25323.
2018-02-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-16Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9Nick Mathewson
2018-02-16Remove changes file for 24898-029 backports in maint-0.3.2Nick Mathewson
These patches were already merged, and so don't need a changes file in these branches.
2018-02-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
"ours" merge to avoid conflicts with the cherry-picked fix for 24898.
2018-02-16stop calling channel_mark_client in response to a create_fastRoger Dingledine
since all it does is produce false positives this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even though the code in the previous commit is already present in 0.3.1. sorry for the mess. [Cherry-picked]
2018-02-16stop calling channel_mark_client in response to a create_fastRoger Dingledine
since all it does is produce false positives this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even though the code in the previous commit is already present in 0.3.1. sorry for the mess.
2018-02-16backport to make channel_is_client() accurateRoger Dingledine
This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of making channel_is_client() be based on what sort of connection handshake the other side used, rather than seeing whether the other side ever sent a create_fast cell to us.
2018-02-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-13fix make check-changesTaylor Yu
2018-02-13Make check-changes happyDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion