Nick Mathewson
73378e9ac1
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-11 18:05:45 -05:00
Nick Mathewson
93b6d41374
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-11 18:05:45 -05:00
Nick Mathewson
46796623f9
Fix a bug in usage of SSL_set1_groups_list()
...
Apparently, even though the manpage says it returns an int, it
can return a long instead and cause a warning.
Bug not in any released Tor. Part of #28399
2018-11-11 18:03:50 -05:00
Nick Mathewson
6b2ff4fff8
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-11 11:57:53 -05:00
Nick Mathewson
8714e98e88
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-11 11:57:53 -05:00
Nick Mathewson
d0c3723c38
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-11 11:57:52 -05:00
Karsten Loesing
5ba3d09a89
Update geoip and geoip6 to the November 6 2018 database.
2018-11-11 11:25:59 +01:00
Nick Mathewson
591a189fa4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-09 10:49:47 -05:00
Nick Mathewson
3ce2d8c4ad
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-09 10:49:47 -05:00
Nick Mathewson
c06b7f090c
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-09 10:49:47 -05:00
Nick Mathewson
45e0004b69
Merge branch 'bug28245_029' into maint-0.2.9
2018-11-09 10:49:43 -05:00
Nick Mathewson
1ba1a1ceca
Always declare groups when building with openssl 1.1.1 APIs
...
Failing to do on clients was causing TLS 1.3 negotiation to fail.
Fixes bug 28245; bugfix on 0.2.9.15, when we added TLS 1.3 support.
2018-11-09 10:10:25 -05:00
Nick Mathewson
336f1fad32
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 13:02:02 -04:00
Nick Mathewson
5acf6f8717
Bump to 0.3.4.9-dev
2018-11-02 13:01:32 -04:00
Nick Mathewson
4ac3ccf286
Copy 0.3.4.9 changelog into releasenotes
2018-11-02 11:28:14 -04:00
Nick Mathewson
563e761be5
Reflow new entries.
2018-11-02 09:25:50 -04:00
Nick Mathewson
928bfdc89e
Draft an 0.3.4.9 changelog
2018-11-02 09:24:31 -04:00
Nick Mathewson
a6240d578e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 09:09:01 -04:00
Nick Mathewson
d8d4fe83d0
Bump to 0.3.4.9
2018-11-02 09:08:45 -04:00
Nick Mathewson
d3769dd4d0
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 09:06:37 -04:00
Nick Mathewson
bfe8f50cc8
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-02 09:06:37 -04:00
Nick Mathewson
6bd069630a
Merge branch 'bug26470_032' into maint-0.3.3
2018-11-02 09:06:32 -04:00
Nick Mathewson
1c5e7430ef
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 09:05:18 -04:00
Nick Mathewson
f288f2478a
Merge branch 'bug26896_034' into maint-0.3.4
2018-11-02 09:05:14 -04:00
Nick Mathewson
1ace561495
Merge branch 'maint-0.3.4' into release-0.3.4
2018-11-02 09:04:25 -04:00
Nick Mathewson
8ed4f1ee84
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-02 09:04:25 -04:00
Nick Mathewson
e847909b71
Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
2018-11-02 09:04:20 -04:00
Nick Mathewson
e160fc57f1
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-31 11:01:41 -04:00
Nick Mathewson
158db532eb
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-31 11:01:41 -04:00
Nick Mathewson
bcc1a71808
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-31 11:01:40 -04:00
Nick Mathewson
0a824bd889
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
2018-10-31 11:01:36 -04:00
Nick Mathewson
9d9b8a5a06
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-30 09:34:04 -04:00
Nick Mathewson
cf2cb783b7
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-30 09:34:04 -04:00
Nick Mathewson
038bc21f88
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
2018-10-30 09:33:36 -04:00
Nick Mathewson
c0d1ba2e94
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-29 15:57:31 -04:00
Nick Mathewson
c4b6b57388
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-29 15:57:31 -04:00
Nick Mathewson
8013e3e8b6
Merge branch 'bug28202_029' into bug28202_033
2018-10-25 09:14:06 -04:00
Nick Mathewson
0878bb961f
Fix two other cases of (buf + N > end) pattern
...
Related to fix for 28202.
2018-10-25 09:08:02 -04:00
Nick Mathewson
368413a321
Fix possible UB in an end-of-string check in get_next_token().
...
Remember, you can't check to see if there are N bytes left in a
buffer by doing (buf + N < end), since the buf + N computation might
take you off the end of the buffer and result in undefined behavior.
Fixes 28202; bugfix on 0.2.0.3-alpha.
2018-10-25 09:06:13 -04:00
Nick Mathewson
a7cd5cea6d
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-24 12:55:36 -04:00
David Goulet
b063ca0604
node: Make node_supports_v3_rendezvous_point() also check for the key
...
It is not enough to look at protover for v3 rendezvous support but also we
need to make sure that the curve25519 onion key is present or in other words
that the descriptor has been fetched and does contain it.
Fixes #27797 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-24 10:30:26 -04:00
Nick Mathewson
274ef2637f
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-23 19:54:16 -04:00
Nick Mathewson
fd6078b33a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-23 19:50:53 -04:00
Nick Mathewson
b2c52f5d6d
Remove a now-unused rust "use".
2018-10-23 19:50:45 -04:00
Nick Mathewson
271144c99e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-23 19:18:23 -04:00
Nick Mathewson
7edc594ee7
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-23 19:18:23 -04:00
Nick Mathewson
169bc670dd
Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
2018-10-23 19:17:48 -04:00
teor
939657771c
Treat backtrace test failures as expected on most BSD-derived systems
...
Treat backtrace test failures as expected on NetBSD, OpenBSD, and
macOS/Darwin, until we solve bug 17808.
(FreeBSD failures have been treated as expected since 18204 in 0.2.8.)
Fixes bug 27948; bugfix on 0.2.5.2-alpha.
2018-10-23 11:21:10 +10:00
Nick Mathewson
64f3637373
Merge branch 'maint-0.3.4' into release-0.3.4
2018-10-18 09:12:58 -04:00
Nick Mathewson
d1eac7830f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-18 09:12:58 -04:00
