aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-09-12prop224: Improve docs in time period funcs.George Kadianakis
2017-09-12Merge remote-tracking branch 'dgoulet/ticket23480_032_01'Nick Mathewson
2017-09-12Merge remote-tracking branch 'asn/bug23457_032_01'Nick Mathewson
2017-09-12hs-v3: Rate limit some log statementsDavid Goulet
Also fix an indentation issue. Closes #23480 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-12hs: Fix digest256 to base64 issue in a log statementDavid Goulet
Part of #23480. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-12Merge branch 'ticket21031'Nick Mathewson
2017-09-12Merge branch 'bug23347_squashed'Nick Mathewson
2017-09-12Add a missing bridge download status resetteor
17750 made unused download schedules automatically reset. But we should make that explicit.
2017-09-12Make clients wait to refresh bridges when they have a recent descriptorteor
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-12Refactor bridge download statuses to increment on attemptteor
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-12Make bridge clients download bridge descriptors immediatelyteor
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-12Merge branch 'maint-0.3.1'Nick Mathewson
2017-09-12Merge branch 'ticket17857_squashed' into maint-0.3.1Nick Mathewson
2017-09-12Changes file for #17857.Mike Perry
2017-09-12Ticket #17857: Apply padding off-switch to existing connections.Mike Perry
2017-09-12changes file for 22215Nick Mathewson
2017-09-12Remove named_map and unnamed_map from networkstatus.cNick Mathewson
2017-09-12Remove networkstatus_nickname_is_unnamed()Neel Chauhan
2017-09-12Add a changes file for 22437.Nick Mathewson
2017-09-12Merge remote-tracking branch 'teor/ticket22437'Nick Mathewson
2017-09-12Merge branch 'bug23479'Nick Mathewson
2017-09-12Merge branch 'maint-0.3.1'Nick Mathewson
2017-09-12Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid torgzip.c change, since torgzip has been replaced.
2017-09-12Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-09-12One more implicit fallthrough warning to fix on GCC 7Nick Mathewson
2017-09-12Whoops -- options_trial_assign() was calling get_options() in #22281Nick Mathewson
So, move the get_options() call.
2017-09-12Add v3 hidden service support to make test-network-allteor
Requires chutney master 50f64ea or later. Implements ticket 22437.
2017-09-12hs-v3: Cancel active descriptor directory connections before uploadingDavid Goulet
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-11Merge remote-tracking branch 'dgoulet/ticket23462_032_01'Nick Mathewson
2017-09-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-09-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-09-11Merge branch 'maint-0.3.1'Nick Mathewson
2017-09-11Fix GCC 7 -Wimplicit-fallthrough warningsAndreas Stieger
Add magic comments recognized by default -Wimplicit-fallthrough=3 or break, as required.
2017-09-11Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)Andreas Stieger
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-11downgrade warning for #23465Nick Mathewson
2017-09-11spellingNick Mathewson
2017-09-11Merge remote-tracking branch 'dgoulet/bug23455_032_01'Nick Mathewson
2017-09-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-09-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-09-11Merge branch 'maint-0.3.1'Nick Mathewson
2017-09-11Fix mixed-sign comparison warning in fix for 22797.Nick Mathewson
2017-09-11Merge branch 'teor-bug22797-025' into maint-0.2.9Nick Mathewson
2017-09-11Merge branch 'ticket22281_squashed'Nick Mathewson
2017-09-11Taboo the get_options() function while options are validatingNick Mathewson
When option validation or transition is happening, there are no "current options" -- only "old options" and "maybe new options". Looking at get_options() is likely a mistake, so have a nonfatal assertion let us know if we do that. Closes 22281.
2017-09-11Merge branch 'ticket23304_032_01_squashed'Nick Mathewson
2017-09-11prop224: Log undecodable descriptor when SafeLogging is offDavid Goulet
Closes #23304 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11circuit: Add a log info when marking for closeDavid Goulet
Closes #23462 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11test: Fix memleaksDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11Merge branch 'maint-0.3.1'Nick Mathewson
2017-09-11Extract the important parts of the run-pending-timers function.Nick Mathewson
Our unit tests will need this, so that they can simulate advancing time without getting libevent involved.