Nick Mathewson
5b345c693e
Merge branch 'maint-0.4.2' into release-0.4.2
2020-08-13 14:20:39 -04:00
Nick Mathewson
45d9830493
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-08-13 14:20:39 -04:00
Nick Mathewson
f9bb49d870
Fix allocation counting in clean_v2_descs_as_dir test.
...
Without this fix, running this test on its own would fail.
Fixes bug 40099. Bugfix on ade5005853 in 0.2.8.1-alpha.
2020-08-12 14:25:46 -04:00
Alexander Færøy
529b989675
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-31 02:03:34 +00:00
Alexander Færøy
4e684c8695
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-31 02:03:34 +00:00
Nick Mathewson
c4742b89b2
Fix a bug in buf_move_all() when the input buffer is empty.
...
We found this in #40076 , after we started using buf_move_all() in
more places. Fixes bug #40076 ; bugfix on 0.3.3.1-alpha. As far as
I know, the crash only affects master, but I think this warrants a
backport, "just in case".
2020-07-30 14:24:25 -04:00
Nick Mathewson
5f4601f5aa
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-29 12:37:07 -04:00
Nick Mathewson
cdb0e6c252
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-29 12:37:07 -04:00
Nick Mathewson
dcc60294ad
Use _lseeki64() on windows.
...
Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging
system to use posix fds.
2020-07-28 11:30:47 -04:00
Nick Mathewson
56e5b0b2b6
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-23 10:09:14 -04:00
Nick Mathewson
3bcbd69a77
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-23 10:09:14 -04:00
Nick Mathewson
f916ddd312
More info in the fallbackdir changes file
2020-07-23 10:08:42 -04:00
David Goulet
6f19e67c98
fallbackdir: Update list for 2020
...
Closes #40061
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-07-23 10:05:11 -04:00
Nick Mathewson
ba3f5a3d88
final entries for 0.4.2.8 changelog
2020-07-09 10:19:52 -04:00
Nick Mathewson
283ce30c53
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-09 09:28:53 -04:00
Nick Mathewson
c2e49a0115
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-09 09:28:53 -04:00
Nick Mathewson
7142f3e435
Merge branch 'trove_2020_001_035' into maint-0.3.5
2020-07-09 09:28:36 -04:00
Alexander Færøy
bd7174bb98
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-08 00:36:48 +00:00
Alexander Færøy
b81e24cda6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-08 00:36:47 +00:00
Nick Mathewson
3e08dd9df1
Resolve a compiler warning from a 32-bit signed/unsigned comparison
...
This warning only affects platforms (like win32) with 32-bit time_t.
Fixes bug 40028; bugfix on 0.3.2.8-rc.
2020-07-07 15:05:38 -04:00
Alexander Færøy
be3baeb879
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-07 14:48:36 +00:00
Alexander Færøy
19d579e8cb
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-07 14:48:35 +00:00
David Goulet
d9cc2b2928
CI: Fix Appveyor printf format error
...
For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.
Fixes #40026
2020-07-07 09:53:54 -04:00
Nick Mathewson
0e10a162bd
Start on a changelog for 0.4.2.8
2020-07-06 17:04:30 -04:00
Alexander Færøy
b46984e97e
Fix out-of-bound memory read in tor_tls_cert_matches_key() for NSS.
...
This patch fixes an out-of-bound memory read in
`tor_tls_cert_matches_key()` when Tor is compiled to use Mozilla's NSS
instead of OpenSSL.
The NSS library stores some length fields in bits instead of bytes, but
the comparison function found in `SECITEM_ItemsAreEqual()` needs the
length to be encoded in bytes. This means that for a 140-byte,
DER-encoded, SubjectPublicKeyInfo struct (with a 1024-bit RSA public key
in it), we would ask `SECITEM_ItemsAreEqual()` to compare the first 1120
bytes instead of 140 (140bytes * 8bits = 1120bits).
This patch fixes the issue by converting from bits to bytes before
calling `SECITEM_ItemsAreEqual()` and convert the `len`-fields back to
bits before we leave the function.
This patch is part of the fix for TROVE-2020-001.
See: https://bugs.torproject.org/33119
2020-07-06 16:19:16 -04:00
David Goulet
07d8d398ca
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-02 07:20:57 -04:00
David Goulet
1a50657e83
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-02 07:20:57 -04:00
Nick Mathewson
39830b6408
Downgrade "Bug: No entry found in extrainfo map" message.
...
This is not actually a bug! It can happen for a bunch of reasons,
which all boil down to "trying to add an extrainfo for which we no
longer have the corresponding routerinfo".
Fixes #16016 ; bugfix on 0.2.6.3-alpha.
2020-06-30 11:54:13 -04:00
Alexander Færøy
dbb70d85bf
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:23:41 +00:00
Alexander Færøy
7d833ee334
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 14:23:41 +00:00
Alexander Færøy
8697205be4
Merge branch 'tor-github/pr/1909' into maint-0.3.5
2020-06-30 14:23:17 +00:00
Alexander Færøy
511e1cfde4
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 14:16:16 +00:00
Alexander Færøy
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +00:00
Alexander Færøy
1b106cdedf
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 14:03:04 +00:00
Alexander Færøy
c9c4a3d0f6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:03:04 +00:00
Alexander Færøy
8444fbe904
Merge branch 'tor-github/pr/1793' into maint-0.3.5
2020-06-30 13:55:39 +00:00
Alexander Færøy
19d9d0ee53
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 13:48:49 +00:00
Alexander Færøy
483082b57b
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:48:49 +00:00
Alexander Færøy
c3ad2a1d23
Merge branch 'tor-github/pr/1785' into maint-0.3.5
2020-06-30 13:47:55 +00:00
Alexander Færøy
c10323faae
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 13:37:20 +00:00
Alexander Færøy
b0bfee8c78
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:37:20 +00:00
Alexander Færøy
bebdd2888f
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
2020-06-30 13:35:13 +00:00
Nick Mathewson
ec2bc07f42
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:57:50 -04:00
Nick Mathewson
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
Nick Mathewson
5668287fe7
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:53:39 -04:00
Nick Mathewson
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
Nick Mathewson
64b8ee3f9e
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:48:32 -04:00
Nick Mathewson
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
Nick Mathewson
57390b76bf
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 12:58:50 -04:00
Nick Mathewson
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00