92e8bdf296
Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
2019-04-09 11:35:41 +10: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
5613968d57
Improve logging for 28614.
...
When we fixed 28614, our answer was "if we failed to load the
consensus on windows and it had a CRLF, retry it." But we logged
the failure at "warn", and we only logged the retry at "info".
Now we log the retry at "notice", with more useful information.
Fixes bug 30004.
2019-04-03 14:30:56 -04: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
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
892b918b66
bwauth: remove declaring args, they are now in use
2019-03-26 17:41:13 +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
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
b76ae3898d
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
2019-03-26 11:48:52 +10:00
3adb689fbc
Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged
...
Copy and paste the vote=0 code from the old src/or/dirserv.c
to the new src/feature/dirauth/bwauth.c.
2019-03-21 12:04:30 +10:00
41cd05562f
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-20 09:48:03 +10:00
1547fd99a6
Merge branch 'bug28656_035_squashed' into maint-0.4.0
2019-03-15 08:59:19 -04:00
532f4c9103
Stop logging a BUG() warning when tor is waiting for exit descriptors
...
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
2019-03-15 08:57:28 -04:00
9c9214f2c9
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-12 11:03:37 -04:00
dc19d65c3b
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
2019-02-28 11:20:26 -05:00
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
aa360b255b
Fix crash bug in PT subsystem.
...
This patch fixes a crash bug (assertion failure) in the PT subsystem
that could get triggered if the user cancels bootstrap via the UI in
TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which
called `process_free()` after it had called `process_terminate()`. This
leads to a crash when the various process callbacks returns with data
after the `process_t` have been freed using `process_free()`.
We solve this issue by ensuring that everywhere we call
`process_terminate()` we make sure to detach the `managed_proxy_t` from
the `process_t` (by calling `process_set_data(process, NULL)`) and avoid
calling `process_free()` at all in the transports code. Instead we just
call `process_terminate()` and let the process exit callback in
`managed_proxy_exit_callback()` handle the `process_free()` call by
returning true to the process subsystem.
See: https://bugs.torproject.org/29562
2019-02-26 15:43:09 +01:00
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
94f7e53d04
fix a bootstrapping string typo
...
introduced in 85542ee5
2019-02-17 16:56:13 -05:00
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
ec7da50ab4
dirvote: Add the bandwidth file digest in the vote
2019-02-13 12:26:00 +00:00
28490fa23e
test: Add test to get the digest of a bw file
2019-02-13 12:26:00 +00:00
fc3e90a7b6
bwauth: Add function to get the digest of a bw file
2019-02-13 12:26:00 +00:00
95e5f8fe03
Merge branch 'tor-github/pr/671'
2019-02-12 13:02:30 -05:00
72b978c3a5
On windows, if we fail to load a consensus and it has a CRLF, retry.
...
Fixes bug 28614; bugfix on 0.4.0.1-alpha when we started mmapping
the consensus.
2019-02-12 12:57:33 -05:00
7f59b9fb1f
Merge branch 'maint-0.3.5'
2019-02-08 08:37:46 -05:00
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
bbd893d6bd
Write consensus files in binary mode
...
This will help us out on windows now that we mmap files. Fixes part
of ticket 28614.
2019-01-29 16:18:41 +01:00
238a9080c6
hs-v3: add an option param to safe log functions
...
We add an option param to safe_str and safe_str_client because in
some case we need to use those functions before global_options is set.
2019-01-24 04:31:18 +07:00
8de735f068
hs-v3: fix use after free in client auth config
...
We accidentally use `auth` after freeing it in
client_service_authorization_free. The way to solve it is to
free after using it.
2019-01-24 04:31:07 +07:00
adeeb8841e
Merge branch 'maint-0.3.5'
2019-01-23 11:18:14 -05:00
712a622fce
Log an HSDesc we failed to parse at Debug loglevel
2019-01-23 10:37:10 -05:00
d1af4d65df
Merge branch 'maint-0.3.5'
2019-01-18 12:25:08 -05:00
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
77712a5fa2
Merge remote-tracking branch 'tor-github/pr/645'
2019-01-17 12:04:50 -05:00
2f683465d4
Bump copyright date to 2019
2019-01-16 12:33:22 -05:00
efe55b8898
Bump copyright date to 2019.
2019-01-16 12:32:32 -05:00
b169c8c14f
Merge remote-tracking branch 'asn-github/adaptive_padding-final'
2019-01-14 14:48:00 -05:00
691dec5d46
Merge branch 'maint-0.3.5'
2019-01-14 14:02:42 -05:00
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
59a88b3c3a
Rename TYPE to TRANSPORT in PT STATUS messages.
...
See: https://bugs.torproject.org/28181
2019-01-14 18:35:13 +01:00
d21fa48cac
Merge branch 'maint-0.3.5'
2019-01-11 18:53:24 -05:00
efd765a948
Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
2019-01-11 18:53:18 -05:00
2f0e187191
Merge remote-tracking branch 'tor-github/pr/627'
2019-01-09 15:46:14 -05:00
teor
Nick Mathewson
George Kadianakis
juga0
David Goulet
Alexander Færøy
Roger Dingledine
Suphanat Chunhapanya
rl1987