4eabc6db47
Use a slightly more accurate formula for OSX 32-bit msec conversion
...
We use an optimized but less accurate formula for converting coarse
time differences to milliseconds on 32-bit OSX platforms, so that we
can avoid 64-bit division.
The old numbers were off by 0.4%. The new numbers are off by .006%.
This should make the unit tests a bit cleaner, and our tolerances a
bit closer.
2018-09-14 08:35:06 -04:00
3ddfd5ff25
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-13 11:46:04 -04:00
8253428253
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-13 11:46:04 -04:00
9697c2da46
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-13 11:46:04 -04:00
c02f2d9eb4
Merge branch 'bug27658_029' into maint-0.2.9
2018-09-13 11:45:58 -04:00
f8d5fb42a3
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-12 17:24:41 -04:00
4fa46fca8e
fixup! changes file
2018-09-12 14:22:31 +00:00
73a37d1e54
Check waitpid return value and exit status in tinytest.c
...
It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit. Notably, this happens on a
leak sanitizer failure.
Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
2018-09-12 08:57:18 -04:00
73ba308d3d
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
2018-09-12 08:17:42 -04:00
03c4d0ab9c
rust/protover: fix check for overlapping ranges
...
Closes ticket 27649. Bugfix on e6625113c9
2018-09-12 02:47:59 +00:00
b88a2f28ae
rust/protover: remove version zero from tests
...
This isn't legal according to dir-spec.txt.
We can write separate tests for it if the spec
is changed to make it legal.
2018-09-12 02:47:59 +00:00
e9ef7d5ab4
test/protover: remove version zero from tests
...
This isn't legal according to dir-spec.txt.
We can write separate tests for it if the spec
is changed to make it legal.
2018-09-12 02:47:29 +00:00
affbe376f9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 15:53:06 -04:00
ae1aea4cc4
Bug 25505: Check circuitmux queues before padding.
2018-09-11 15:53:03 -04:00
5a8827a4c9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 13:09:21 -04:00
89c5b8d7dc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 13:09:21 -04:00
1d8957129b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 13:09:21 -04:00
46bccc50e5
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
2018-09-11 13:09:18 -04:00
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
c3a750486c
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
2018-09-11 13:09:04 -04:00
198b6354e6
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
2018-09-11 13:08:57 -04:00
8a873a5695
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 12:04:56 -04:00
8afc100cb5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 12:04:56 -04:00
3119cb5062
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 12:04:55 -04:00
19429fac23
Update geoip and geoip6 to the September 6 2018 database.
2018-09-11 09:26:59 +02:00
96601a6805
Bump to 0.3.4.8-dev
2018-09-10 09:42:40 -04:00
7a343ecec5
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid version bump.
2018-09-10 09:42:22 -04:00
05f5f65006
Bump to 0.3.3.10-dev.
2018-09-10 09:42:12 -04:00
8cfca28be2
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid version bump.
2018-09-10 09:41:55 -04:00
8408331b3e
Merge branch 'maint-0.2.9' into maint-0.3.2
...
"ours" to avoid version bump.
2018-09-10 09:41:39 -04:00
ec4a7641f1
Bump to 0.3.2.12-dev
2018-09-10 09:41:34 -04:00
b203dedaf5
Bump to 0.2.9.17-dev
2018-09-10 09:41:22 -04:00
0d5aaef465
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid bump.
2018-09-07 15:12:27 -04:00
cff7cb858b
Merge branch 'maint-0.3.2' into maint-0.3.3
...
"ours" to avoid bump
2018-09-07 15:12:09 -04:00
36885f34f6
Merge branch 'maint-0.2.9' into maint-0.3.2
...
"ours" to avoid bump
2018-09-07 15:11:49 -04:00
43e400f340
Bump to 0.3.3.10
2018-09-07 15:11:18 -04:00
cdaf9aec8e
Bump to 0.3.2.12
2018-09-07 15:11:07 -04:00
da29074fc4
Bump to 0.2.9.17
2018-09-07 15:10:49 -04:00
fa38bbb700
Bump to 0.3.4.8
2018-09-07 09:49:29 -04:00
732ea9120c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 09:15:56 -04:00
8849b2ca3c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 09:15:56 -04:00
0366ae224c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 09:15:52 -04:00
1e46a391b3
Merge branch 'ticket27344_029' into maint-0.2.9
2018-09-07 09:15:15 -04:00
2ec88a2a6d
Tell openssl to build its TLS contexts with security level 1
...
Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.
2018-09-07 09:15:06 -04:00
967cef2f8f
Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
2018-09-07 08:48:19 -04:00
056003d602
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:46:45 -04:00
987e12a58f
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:46:45 -04:00
a78504dbe6
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:46:45 -04:00
eacaff6ccc
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
2018-09-07 08:46:41 -04:00
9fcb3ef787
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
2018-09-07 08:46:35 -04:00
Nick Mathewson
cypherpunks
Mike Perry
Karsten Loesing