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
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
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
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
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
6ab1929f00
Add connection_dir_buf_add() helper function
2019-03-29 17:25:43 +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
e3e38b5ba1
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-27 10:02:51 +10:00
ca29cb397b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-27 10:02:47 +10:00
3280e9a116
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-27 10:02:40 +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
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
fa9e0963cf
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-26 15:16:37 +02:00
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
1cd59525cc
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-26 19:16:02 +10:00
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
6ecf9590ea
changes: add file for #21377
2019-03-26 17:41:21 +10:00
da7a8d7624
dircache: fix identation and remove unneded goto
2019-03-26 17:41:17 +10:00
892b918b66
bwauth: remove declaring args, they are now in use
2019-03-26 17:41:13 +10:00
a4bf3be8bc
test: check that .../bandwidth.z is compressed
2019-03-26 17:41:09 +10:00
fb4a40c32c
test: Check bw file cache lifetime
2019-03-26 17:41:06 +10:00
7627134743
bwauth: increment bw file cache lifetime
...
Increment bw file cache lifetime when serving it by HTTP.
And add a constant to define that lifetime.
2019-03-26 17:41:02 +10:00
4d3502e45b
bwauth: check and use compression serving bw file
2019-03-26 17:40:58 +10:00
b75e2539f9
bwauth: check if a bw file could be read
...
Before serving it by HTTP.
2019-03-26 17:40:54 +10:00
ee09e5d7ea
bwauth: use flag to do not warn when file is missing
...
Use flag to do not warn when the bandwidth file is missing trying
to serve it by http.
Also remove double space in the assignement.
2019-03-26 17:40:50 +10:00
3eacae42b2
Serve bandwidth file used in the next vote
...
When a directory authority is using a bandwidth file to obtain the
bandwidth values that will be included in the next vote, serve this
bandwidth file at /tor/status-vote/next/bandwidth.z.
2019-03-26 17:40:45 +10:00
08c4792413
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-26 16:56:59 +10:00
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
669ec64325
Fix CID 1444119
...
Let's use the same function exit point for BUG() codepath that we're using
for every other exit condition. That way, we're not forgetting to clean up
the memarea.
2019-03-26 12:24:45 +10:00
George Kadianakis
Nick Mathewson
teor
Karsten Loesing
rl1987
juga0