Nick Mathewson
7dbaaba3d2
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-26 10:29:29 -04:00
Nick Mathewson
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
Nick Mathewson
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
Nick Mathewson
9f93bcd16d
Remove sb_poll check: all poll() calls are ok.
2018-03-20 08:30:21 -04:00
Nick Mathewson
070eda5a21
Add the poll() syscall as permitted by the sandbox
...
Apparently, sometimes getpwnam will call this.
Fixes bug 25513.
2018-03-20 08:23:44 -04:00
Nick Mathewson
109c555e9d
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-19 16:59:49 -04:00
Isis Lovecruft
66d3120634
tests: Fix HS test against max IP lifetime.
...
* FIXES part of #25450 : https://bugs.torproject.org/25450
2018-03-19 16:59:07 -04:00
Nick Mathewson
bc0de600b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-19 05:42:43 -04:00
Nick Mathewson
1aa0ae2cc3
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-19 05:42:43 -04:00
Nick Mathewson
3370b3cfef
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-19 05:42:43 -04:00
Nick Mathewson
36154c13f4
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-19 05:42:43 -04:00
Nick Mathewson
0eb2cdf99d
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
2018-03-19 05:42:38 -04:00
Nick Mathewson
75b544d64d
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-19 05:36:06 -04:00
Nick Mathewson
a0cc7e9492
Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2
2018-03-19 05:35:39 -04:00
Nick Mathewson
2f397236b2
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-13 10:59:30 -04:00
Nick Mathewson
d60dc27555
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:59:30 -04:00
Nick Mathewson
4b067f8b12
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-13 10:58:03 -04:00
Nick Mathewson
38b7885c90
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:58:03 -04:00
Nick Mathewson
0e7f15fdb6
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-13 10:58:02 -04:00
Nick Mathewson
67a313f0ec
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-13 10:58:02 -04:00
Karsten Loesing
3418a3a7f0
Update geoip and geoip6 to the March 8 2018 database.
2018-03-13 10:57:49 -04:00
Nick Mathewson
4a03851e42
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-13 13:42:06 +01:00
Nick Mathewson
094294dbb1
Merge branch 'bug25474_032' into maint-0.3.2
2018-03-13 13:41:11 +01:00
Nick Mathewson
53a807e1e9
Add a missing prototype to our libevent configure stanza.
...
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
2018-03-13 13:37:26 +01:00
Isis Lovecruft
9191d962f9
changes: Fix changes file for bug25450.
...
It didn't like me insulting my patch, I guess.
2018-03-08 20:50:57 +00:00
Isis Lovecruft
0545f64d24
test: Increase time limit for IP creation in an HS test.
...
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-08 20:50:50 +00:00
Nick Mathewson
2d42648eaf
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-03 11:34:10 -05:00
Nick Mathewson
0026d1a673
bump version to 0.3.2.10-dev
2018-03-03 11:33:27 -05:00
Nick Mathewson
d81a5231ee
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid version bump
2018-03-03 11:33:02 -05:00
Nick Mathewson
0aa794d309
version bump to 0.3.1.10-dev
2018-03-03 11:32:51 -05:00
Nick Mathewson
2e2aacca2a
Merge branch 'maint-0.2.9' into maint-0.3.1
...
"ours" merge to avoid version bump.
2018-03-03 11:32:29 -05:00
Nick Mathewson
9eb6f9d3c8
Bump version to 0.2.9.15-dev
2018-03-03 11:32:16 -05:00
Nick Mathewson
31cc63deb6
copy changelog into release notes
2018-03-03 07:58:00 -05:00
Nick Mathewson
8231cc868e
final (?) changelog tweaks
2018-03-03 07:48:49 -05:00
Nick Mathewson
a9769b78f0
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-01 16:44:31 -05:00
Nick Mathewson
1ec386561e
version bump to 0.3.2.10
2018-03-01 16:43:35 -05:00
Nick Mathewson
5b0ae08400
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" to avoid version bump.
2018-03-01 16:43:10 -05:00
Nick Mathewson
c527a8a9c9
Update to 0.3.1.10
2018-03-01 16:43:01 -05:00
Nick Mathewson
805a785780
Merge branch 'maint-0.2.9' into maint-0.3.1
...
"ours" merge to avoid version bump.
2018-03-01 16:42:25 -05:00
Nick Mathewson
35753c0774
version bump to 0.2.9.15
2018-03-01 16:42:17 -05:00
Nick Mathewson
499bdd81a7
Draft changelog for 0.3.2.10
2018-03-01 16:41:48 -05:00
Nick Mathewson
d01abb9346
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-01 16:07:59 -05:00
Nick Mathewson
d4a758e083
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-01 16:07:59 -05:00
Nick Mathewson
bc8b5fb559
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-01 16:07:59 -05:00
Nick Mathewson
c1bb8836ff
Protover tests: disable some obsoleted tests
...
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-01 16:05:17 -05:00
Nick Mathewson
c5295cc1be
Spec conformance on protover: always reject ranges where lo>hi
2018-03-01 16:05:17 -05:00
Nick Mathewson
1fe0bae508
Forbid UINT32_MAX as a protocol version
...
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-01 16:05:17 -05:00
Nick Mathewson
8b405c609e
Forbid "-0" as a protocol version.
...
Fixes part of 24249; bugfix on 0.2.9.4-alpha.
2018-03-01 16:05:17 -05:00
Nick Mathewson
0953c43c95
Add more of Teor's protover tests.
...
These are as Teor wrote them; I've disabled the ones that don't pass
yet, with XXXX comments.
2018-03-01 16:05:17 -05:00
Nick Mathewson
d3a1bdbf56
Add some protover vote round-trip tests from Teor.
...
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-01 16:05:17 -05:00