Nick Mathewson
7b9732063c
practracker updates from messaging_v3 merge
...
(main.c is a bit better, but shutdown.c is ugly)
2019-03-26 20:14:21 -04:00
Nick Mathewson
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
Nick Mathewson
3767eff9bb
changes file for pubsub code
2019-03-26 20:10:56 -04:00
teor
57999e330b
Merge branch 'maint-0.4.0'
2019-03-27 10:02:55 +10:00
teor
ca29cb397b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-27 10:02:47 +10:00
teor
3280e9a116
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-27 10:02:40 +10:00
teor
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +10:00
Nick Mathewson
203e9138d1
Remove message/subsystem numbers from log messages
...
Having the numbers in those messages makes some of the unit test
unstable, by causing them to depend on the initialization order of
the naming objects.
2019-03-26 19:56:39 -04:00
teor
beceb079e1
practracker: regen in master, for bug28925 merged to 0.4.0 and later
...
python3 scripts/maint/practracker/practracker.py --regen
2019-03-27 09:40:03 +10:00
teor
c72526f168
Merge branch 'maint-0.4.0'
2019-03-27 09:36:55 +10:00
teor
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
Nick Mathewson
7502e5467b
Regenerate practracker file from scratch.
...
Closes ticket 29912.
Since this is the first time that practracker has had a stable
output order, this diff will be larger than usual.
2019-03-26 19:28:35 -04:00
Nick Mathewson
300e7d8c99
Merge branch 'practracker_regen'
2019-03-26 19:27:54 -04:00
George Kadianakis
989b6325d6
Merge branch 'tor-github/pr/842'
2019-03-26 16:41:07 +02:00
Nick Mathewson
e028ec6bb7
Add new exceptions.txt entries
2019-03-26 09:43:46 -04:00
Nick Mathewson
f32d890531
Merge branch 'bug29805_rebased_squashed'
2019-03-26 09:39:46 -04:00
George Kadianakis
27f24484d4
prob-distr: Some more comments about the initializers.
...
Based on patches and review comments by Riastradh and Catalyst.
Co-authored-by: Taylor R Campbell <campbell+tor@mumble.net>
Co-authored-by: Taylor Yu <catalyst@torproject.org>
2019-03-26 09:39:40 -04:00
George Kadianakis
08176c2396
prob-distr: Silence some coverity warnings.
2019-03-26 09:39:37 -04:00
George Kadianakis
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
George Kadianakis
2790ee3685
Merge branch 'maint-0.4.0'
2019-03-26 15:16:37 +02:00
George Kadianakis
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
Nick Mathewson
39e4494344
practracker: update usage note in docstring
2019-03-26 08:42:14 -04:00
teor
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00
teor
0642650865
Merge branch 'maint-0.4.0'
2019-03-26 19:16:06 +10:00
teor
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
rl1987
4e6ba575a6
Add header guards to ptr_helpers.h
2019-03-26 09:49:32 +02:00
juga0
6ecf9590ea
changes: add file for #21377
2019-03-26 17:41:21 +10:00
juga0
da7a8d7624
dircache: fix identation and remove unneded goto
2019-03-26 17:41:17 +10:00
juga0
892b918b66
bwauth: remove declaring args, they are now in use
2019-03-26 17:41:13 +10:00
juga0
a4bf3be8bc
test: check that .../bandwidth.z is compressed
2019-03-26 17:41:09 +10:00
juga0
fb4a40c32c
test: Check bw file cache lifetime
2019-03-26 17:41:06 +10:00
juga0
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
juga0
4d3502e45b
bwauth: check and use compression serving bw file
2019-03-26 17:40:58 +10:00
juga0
b75e2539f9
bwauth: check if a bw file could be read
...
Before serving it by HTTP.
2019-03-26 17:40:54 +10:00
juga0
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
juga0
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
teor
3d38d0ca24
Merge branch 'maint-0.4.0'
2019-03-26 16:57:04 +10:00
teor
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
teor
ec736f8729
Merge remote-tracking branch 'tor-github/pr/833'
2019-03-26 13:02:37 +10:00
teor
d482913e69
Merge remote-tracking branch 'tor-github/pr/834'
2019-03-26 12:55:48 +10:00
rl1987
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
teor
3af9a51118
test/dir: add a 4th argument to dirserv_read_measured_bandwidths()
...
Part of 29806.
2019-03-26 11:49:33 +10:00
teor
b76ae3898d
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
2019-03-26 11:48:52 +10:00
George Kadianakis
473decb246
Merge branch 'tor-github/pr/839'
2019-03-26 01:17:58 +02:00
Nick Mathewson
ddb31dd583
Rename one case of c_type to c_ptr_type.
2019-03-25 16:35:34 -04:00
Nick Mathewson
3f0bfe1d29
Rename DISPATCH_DEFINE_TYPE() to DISPATCH_REGISTER_TYPE()
...
Also fix a grammar error in a comment.
2019-03-25 16:35:34 -04:00
Nick Mathewson
28fd4996ac
Various documentation notes and tweaks for pubsub
2019-03-25 16:35:34 -04:00
Nick Mathewson
a8ca464cee
Log warning messages _before_ exiting because of earlier dcfg failure
...
This helps diagnostics.
2019-03-25 16:35:34 -04:00
Nick Mathewson
47de9c7b0a
Use actual pointers in dispatch_cfg.c.
...
Previously, I had used integers encoded as pointers. This
introduced a flaw: NULL represented both the integer zero, and the
absence of a setting. This in turn made the checks in
cfg_msg_set_{type,chan}() not actually check for an altered value if
the previous value had been set to zero.
Also, I had previously kept a pointer to a dispatch_fypefns_t rather
than making a copy of it. This meant that if the dispatch_typefns_t
were changed between defining the typefns and creating the
dispatcher, we'd get the modified version.
Found while investigating coverage in pubsub_add_{pub,sub}_()
2019-03-25 16:35:34 -04:00
Nick Mathewson
8d70f21717
Add a test for pubsub_items_clear_bindings()
2019-03-25 16:35:34 -04:00