Nick Mathewson
dedafe95fe
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 17:09:47 -04:00
Nick Mathewson
eb078a3bd5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-12 17:09:47 -04:00
Nick Mathewson
3092c8bb3e
Merge branch 'maint-0.3.1'
2017-09-12 17:09:47 -04:00
Nick Mathewson
3138fe2e69
Merge branch 'bug15582_029' into maint-0.2.9
2017-09-12 17:09:42 -04:00
Nick Mathewson
9c27f56cd9
Fix torrc-format documentation corner cases
...
We don't require that the final line be terminated, and we open
windows torrc files in text mode.
Closes ticket 22795.
2017-09-12 16:32:56 -04:00
Nick Mathewson
6ff6738963
Remove redundant items from testing_tor_network_defaults
...
These items were listed in testing_tor_network_defaults, but had the
same defaults as with the regular settings.
Closes ticket 22532.
2017-09-12 16:23:37 -04:00
Nick Mathewson
d9e2db1efd
Avoid sscanf() warnings from openbsd in the unit tests
...
OpenBSD doesn't like tricks where you use a too-wide sscanf argument
for a too-narrow array, even when you know the input string
statically. The fix here is just to use bigger buffers.
Fixes 15582; bugfix on a3dafd3f58
2017-09-12 16:01:12 -04:00
Nick Mathewson
d165812416
remove a redundant changes file for 22750
2017-09-12 15:39:06 -04:00
David Goulet
6b4eace248
hs-v3: Stall SOCKS connection when no live consensus available
...
Fixes #23481
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-12 21:34:26 +03:00
George Kadianakis
f13ca360c9
prop224: Improve docs in time period funcs.
2017-09-12 21:17:35 +03:00
Nick Mathewson
d71a00e91f
Merge remote-tracking branch 'dgoulet/ticket23480_032_01'
2017-09-12 11:20:27 -04:00
Nick Mathewson
6c5c74e11e
Merge remote-tracking branch 'asn/bug23457_032_01'
2017-09-12 11:10:48 -04:00
David Goulet
98953b1fc2
hs-v3: Rate limit some log statements
...
Also fix an indentation issue.
Closes #23480
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-12 11:03:13 -04:00
David Goulet
184bd22586
hs: Fix digest256 to base64 issue in a log statement
...
Part of #23480 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-12 11:03:13 -04:00
Nick Mathewson
26d462c1f0
Merge branch 'ticket21031'
2017-09-12 10:43:34 -04:00
Nick Mathewson
4027bd2e96
Merge branch 'bug23347_squashed'
2017-09-12 10:38:35 -04:00
teor
1b5e34badb
Add a missing bridge download status reset
...
17750 made unused download schedules automatically reset.
But we should make that explicit.
2017-09-12 10:38:25 -04:00
teor
93a8ed3b83
Make clients wait to refresh bridges when they have a recent descriptor
...
But when clients are just starting, make them try each bridge a few times
before giving up on it.
These changes make the bridge download schedules more explicit: before
17750, they relied on undocumented behaviour and specific schedule
entries. (And between 17750 and this fix, they were broken.)
Fixes 23347, not in any released version of tor.
2017-09-12 10:38:25 -04:00
teor
6370fb77c5
Refactor bridge download statuses to increment on attempt
...
We were always incrementing bridge download statuses on each attempt,
but we were using the "increment on failure" functions to do it.
And we never incremented them on failure.
No behaviour change.
2017-09-12 10:38:25 -04:00
teor
97249c4f5e
Make bridge clients download bridge descriptors immediately
...
The download schedule tells Tor to wait 15 minutes before downloading
bridge descriptors. But 17750 made Tor ignore that and start immediately.
Since we fixed 17750, Tor waits 15 minutes for bridge client bootstrap,
like the schedule says.
This fixes the download schedule to start immediately, and to try each
bridge 3 times in the first 30 seconds. This should make bridge bootstraps
more reliable.
Fixes 23347.
2017-09-12 10:38:25 -04:00
Nick Mathewson
8eef7fc845
Merge branch 'maint-0.3.1'
2017-09-12 10:30:54 -04:00
Nick Mathewson
befddf6d2a
Merge branch 'ticket17857_squashed' into maint-0.3.1
2017-09-12 10:29:00 -04:00
Mike Perry
6689c95d06
Changes file for #17857 .
2017-09-12 10:28:45 -04:00
Mike Perry
6d221c8f37
Ticket #17857 : Apply padding off-switch to existing connections.
2017-09-12 10:28:45 -04:00
Nick Mathewson
5238210da4
changes file for 22215
2017-09-12 09:58:07 -04:00
Nick Mathewson
035fe2d208
Remove named_map and unnamed_map from networkstatus.c
2017-09-12 09:56:42 -04:00
Neel Chauhan
42b5e3cbb7
Remove networkstatus_nickname_is_unnamed()
2017-09-12 09:52:07 -04:00
Nick Mathewson
4ace1b96ac
Add a changes file for 22437.
2017-09-12 09:31:57 -04:00
Nick Mathewson
2bfc490c1e
Merge remote-tracking branch 'teor/ticket22437'
2017-09-12 09:30:33 -04:00
Nick Mathewson
80a22f536a
Merge branch 'bug23479'
2017-09-12 09:24:54 -04:00
Nick Mathewson
767372f6a0
Merge branch 'maint-0.3.1'
2017-09-12 09:24:34 -04:00
Nick Mathewson
469189d84a
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid torgzip.c change, since torgzip has been replaced.
2017-09-12 09:24:20 -04:00
Nick Mathewson
0729ba2868
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 09:23:57 -04:00
Nick Mathewson
bac160b4e0
One more implicit fallthrough warning to fix on GCC 7
2017-09-12 09:22:50 -04:00
Nick Mathewson
5bb4e0c88d
Whoops -- options_trial_assign() was calling get_options() in #22281
...
So, move the get_options() call.
2017-09-12 08:40:13 -04:00
teor
d7d8d2c20e
Add v3 hidden service support to make test-network-all
...
Requires chutney master 50f64ea or later.
Implements ticket 22437.
2017-09-12 17:08:28 +10:00
David Goulet
7150214baf
hs-v3: Cancel active descriptor directory connections before uploading
...
It is possible that two descriptor upload requests are launched in a very
short time frame which can lead to the second request finishing before the
first one and where that first one will make the HSDir send back a 400
malformed descriptor leading to a warning.
To avoid such, cancel all active directory connections for the specific
descriptor we are about to upload.
Note that this race is still possible on the HSDir side which triggers a log
info to be printed out but that is fine.
Fixes #23457
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-12 01:32:04 +03:00
Nick Mathewson
6e4967ef03
Merge remote-tracking branch 'dgoulet/ticket23462_032_01'
2017-09-11 17:57:31 -04:00
Nick Mathewson
eaa8224cef
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 17:49:18 -04:00
Nick Mathewson
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -04:00
Nick Mathewson
e3caad0ea1
Merge branch 'maint-0.3.1'
2017-09-11 17:49:18 -04:00
Andreas Stieger
6cd5a80275
Fix GCC 7 -Wimplicit-fallthrough warnings
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
2017-09-11 17:47:04 -04:00
Andreas Stieger
b81a2e8f46
Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.
[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson
b719fa7efe
downgrade warning for #23465
2017-09-11 16:50:43 -04:00
Nick Mathewson
c5a5597572
spelling
2017-09-11 16:48:27 -04:00
Nick Mathewson
2a1ddd78da
Merge remote-tracking branch 'dgoulet/bug23455_032_01'
2017-09-11 16:32:40 -04:00
Nick Mathewson
d4f87073ae
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 16:29:10 -04:00
Nick Mathewson
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -04:00
Nick Mathewson
007d3d2337
Merge branch 'maint-0.3.1'
2017-09-11 16:29:10 -04:00
Nick Mathewson
6a49e3360b
Fix mixed-sign comparison warning in fix for 22797.
2017-09-11 16:29:06 -04:00
