a51f5b9b36
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-06 12:16:01 +10:00
b100c9e980
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0
2019-04-06 12:15:41 +10:00
4dd96f7444
changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
2019-04-06 11:07:20 +10:00
5cb94cbf9d
NSS: disable TLS1.2 SHA-384 ciphersuites.
...
In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.
Fixes bug 29241; bugfix on 0.4.0.1-alpha.
2019-04-06 11:06:34 +10:00
680fd3f8fb
NSS: Log an error message when SSL_ExportKeyingMaterial() fails
...
Diagnostic for 29241.
2019-04-06 11:06:22 +10:00
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
8a158b82ba
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 16:45:36 +03:00
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
0ba45b2977
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:57:06 +03:00
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
5ac2878770
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:55:22 +03:00
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
f9f6718c50
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:53:39 +03:00
217db9efe1
Merge branch 'tor-github/pr/902' into maint-0.4.0
2019-04-05 14:53:33 +03:00
4bc88a266a
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-05 14:51:33 +03:00
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
28db7646ba
Changes file for bug 29500.
2019-04-05 12:14:18 +10:00
8a010c8b83
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-04 20:27:04 -04:00
d016bbaa7d
Merge branch 'bug29959_040_squashed' into maint-0.4.0
2019-04-04 20:26:47 -04:00
8e961b2174
bwauth: Actually include the bandwidth-file-digest in authority votes
...
Fixes bug 29959; bugfix on 0.4.0.2-alpha.
2019-04-04 20:26:09 -04:00
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
db1c1dba34
Merge branch 'bug30021_029' into bug30021_035
2019-04-04 11:26:33 -04:00
1710f4bbd6
Do not cache bogus results from classifying client ciphers
...
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol. This, in turn, was causing Stem
integration tests to stall in some cases. Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
2019-04-04 11:24:55 -04:00
ef06ef217a
Merge branch 'bug30011_035' into bug30011_040
...
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck.
Move shellcheck into the correct category.
2019-04-04 13:23:26 +10:00
3fa42d599a
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
...
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011; bugfix on 0.3.5.4-alpha.
2019-04-04 13:21:35 +10:00
de0babab9b
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-03 17:59:46 +03:00
42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
33e0c03103
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-03 17:55:41 +03:00
828f1829c8
Merge branch 'tor-github/pr/811' into maint-0.4.0
2019-04-03 17:50:49 +03:00
eb3b4dcd79
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-03 09:27:44 -04:00
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
9452833fc3
Merge branch 'maint-0.4.0' into release-0.4.0
2019-04-02 11:45:35 +10:00
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
7014e57f4a
Merge branch 'bug29036-29962-034' into bug29036-29962-035
...
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
2019-04-01 14:11:20 +10:00
124990aa01
Add changes file
2019-04-01 14:08:24 +10:00
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-01 14:07:58 +10:00
eb0bd18d6e
changes: Use the first Tor version with CI coverage for the 29036 changes file
...
Otherwise, "make check-changes" will complain when we backport the change.
2019-04-01 13:40:16 +10:00
194b25f0c7
dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
...
Implements ticket 29897.
2019-03-29 17:26:30 +10:00
c2222ba169
Add changes file
2019-03-29 17:26:09 +10:00
bf2b8fcb45
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-27 12:31:33 +10:00
6d188fb4cc
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
2019-03-27 12:31:07 +10:00
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +10:00
571a7d5917
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-27 09:36:50 +10:00
teor
Nick Mathewson
George Kadianakis
Mike Perry
Karsten Loesing
rl1987