f89eb4a021
Merge branch 'maint-0.2.9' into release-0.2.9
2019-03-01 14:15:30 +10:00
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
46b027b8b7
Merge branch 'maint-0.2.9' into release-0.2.9
2019-02-28 10:45:22 +10:00
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
ec49580a74
Merge branch 'maint-0.2.9' into release-0.2.9
2019-02-27 09:37:27 +10:00
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-02-19 11:38:32 -05:00
935ac71079
Merge branch 'maint-0.2.9' into release-0.2.9
2019-02-12 09:56:48 -05:00
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
46ab93ca77
Merge branch 'maint-0.2.9' into release-0.2.9
2019-01-23 09:49:26 -05:00
dd6c2b0ad7
maint-0.2.9: remove changes files that are merged in 0.2.9 releases
...
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
2019-01-23 09:48:28 -05:00
06338dc605
Merge branch 'maint-0.2.9' into release-0.2.9
2019-01-18 12:25:08 -05:00
89a0b77740
rend: stop warning when clients send multiple rend establish cells
...
Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.
Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-10 07:59:59 +10:00
ad70dd403b
Merge branch 'maint-0.2.9' into release-0.2.9
2019-01-07 08:43:45 -05:00
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
e403f88063
Merge branch 'maint-0.2.9' into release-0.2.9
2019-01-04 15:04:58 -05:00
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
32ed153282
Merge branch 'maint-0.2.9' into release-0.2.9
2018-12-11 10:00:22 -05:00
3b5188576f
Note ticket number in changes file for 24803
2018-12-11 10:00:19 -05:00
ef87966ec0
Merge branch 'maint-0.2.9' into release-0.2.9
2018-12-11 09:41:04 -05:00
4991b29311
Fallbacks: Update the hard-coded fallback list in December 2018
...
Merge Phoul's two lists into teor's list.
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
157 fallbacks (92 new, 65 existing, 85 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-10 17:02:19 +10:00
78e177d622
Fallbacks: Update the hard-coded fallback list in December 2018
...
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in
January 2018 (of which ~115 were still functional), with a list of
148 fallbacks (89 new, 59 existing, 91 removed) generated in
December 2018.
Closes ticket 24803.
2018-12-07 16:43:10 +10:00
30ecd90961
Merge branch 'maint-0.2.9' into release-0.2.9
2018-12-06 09:26:31 -05:00
57798eb1cb
Update geoip and geoip6 to the December 5 2018 database.
2018-12-05 21:02:39 +01:00
ea890d7def
Merge branch 'maint-0.2.9' into release-0.2.9
2018-11-15 16:45:30 -05:00
8569166c70
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
...
Resolved conflicts with the 26269 fix in 015fcd0e11
2018-11-15 16:43:50 -05:00
7651775b8f
Merge branch 'maint-0.2.9' into release-0.2.9
2018-11-13 08:26:54 -05:00
7f042cbc0a
Merge branch 'bug28413_029' into maint-0.2.9
2018-11-13 08:26:51 -05:00
1a11702a9a
Fix a compiler warning in aes.c.
...
Apparently some freebsd compilers can't tell that 'c' will never
be used uninitialized.
Fixes bug 28413; bugfix on 0.2.9.3-alpha when we added support for
longer AES keys to this function.
2018-11-12 15:39:28 -05:00
79443fd82e
Merge branch 'maint-0.2.9' into release-0.2.9
2018-11-11 18:05:45 -05:00
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
65d4551a3f
Merge branch 'maint-0.2.9' into release-0.2.9
2018-11-11 11:57:52 -05:00
5ba3d09a89
Update geoip and geoip6 to the November 6 2018 database.
2018-11-11 11:25:59 +01:00
5689caeda1
Merge branch 'maint-0.2.9' into release-0.2.9
2018-11-09 10:49:47 -05:00
45e0004b69
Merge branch 'bug28245_029' into maint-0.2.9
2018-11-09 10:49:43 -05:00
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
2a83cca83b
Merge branch 'maint-0.2.9' into release-0.2.9
2018-10-31 11:01:40 -04:00
0a824bd889
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
2018-10-31 11:01:36 -04:00
ed45a95349
Merge branch 'maint-0.2.9' into release-0.2.9
2018-10-29 15:57:30 -04:00
0878bb961f
Fix two other cases of (buf + N > end) pattern
...
Related to fix for 28202.
2018-10-25 09:08:02 -04:00
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
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
17d7095e11
Merge branch 'maint-0.2.9' into release-0.2.9
2018-10-15 12:47:46 -04:00
5b28190c67
Fix make check-spaces.
2018-10-15 12:47:19 -04:00
9a60e46ae9
Merge branch 'maint-0.2.9' into release-0.2.9
2018-10-15 10:34:41 -04:00
b113399658
Merge branch 'bug27709_029' into maint-0.2.9
2018-10-15 10:34:39 -04:00
5e582c7ffa
Explain a bit more about branch prediction in the unit-test case
2018-10-15 10:16:34 -04:00
dcb6924cd5
Merge branch 'maint-0.2.9' into release-0.2.9
2018-10-10 17:12:34 -04:00
717507e3bb
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
2018-10-10 17:12:11 -04:00
teor
Kris Katterjohn
Nick Mathewson
Karsten Loesing