summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fixup! Change language in Schedulers section of manualticket24158Matt Traudt2017-11-07
|
* Change language in Schedulers section of manualMatt Traudt2017-11-07
|
* Merge branch 'maint-0.3.2'Nick Mathewson2017-11-06
|\
| * Merge branch 'bug24150_032_squashed' into maint-0.3.2Nick Mathewson2017-11-06
| |\
| | * Fix a memory leak on decryption non-failure of v3 hsdescNick Mathewson2017-11-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it decrypts something that turns out to start with a NUL byte, then decrypt_desc_layer() will return 0 to indicate the length of its result. But 0 also indicates an error, which causes the result not to be freed by decrypt_desc_layer()'s callers. Since we're trying to stabilize 0.3.2.x, I've opted for the simpler possible fix here and made it so that an empty decrypted string will also count as an error. Fixes bug 24150 and OSS-Fuzz issue 3994. The original bug was present but unreachable in 0.3.1.1-alpha. I'm calling this a bugfix on 0.3.2.1-alpha since that's the first version where you could actually try to decrypt these descriptors.
* | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-06
|\ \ \ | |/ /
| * | Fix a 32-bit formatting warningNick Mathewson2017-11-06
| | |
* | | Merge remote-tracking branch 'atagar/manual'Nick Mathewson2017-11-06
|\ \ \
| * | | Fix manual formattingDamian Johnson2017-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Few issues... * Malformed ReducedExitPolicy, causing brackets to appear. * ExitPolicyDefault wasn't actually listed, instead it munged the description into the ExitPolicy description. * Extra plus signs in the ExitPolicy and ReducedExitPolicy entries. After an hour of struggling with asciidoc couldn't figure out how to format it as 'paragraph => example => paragraph with same indentation' so just rearranging the ExitPolicy entry. Patches welcome if someone strongly prefers having the paragraph after the example. https://trac.torproject.org/projects/tor/ticket/24147
* | | | Merge remote-tracking branch 'dgoulet/bug24053_033_01'Nick Mathewson2017-11-06
|\ \ \ \
| * | | | test: Fix SR initialization in routerlist testDavid Goulet2017-11-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24053 Signed-off-by: David Goulet <dgoulet@torproject.org>
* | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-06
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'public/bug23318_029' into maint-0.3.2Nick Mathewson2017-11-06
| |\ \ \ \
| | * | | | Remove an erroneous 0.5 in compute_weighted_bandwidths()Nick Mathewson2017-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back in 0.2.4.3-alpha (e106812a778f537), when we switched from using double to using uint64 for selecting by bandwidth, I got the math wrong: I should have used llround(x), or (uint64_t)(x+0.5), but instead I wrote llround(x+0.5). That means we would always round up, rather than rounding to the closest integer Fixes bug 23318; bugfix on 0.2.4.3-alpha.
* | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-05
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | lintchanges: Allow 'fixes bugs a, b, and c'Nick Mathewson2017-11-05
| | | | |
| * | | | Merge branch 'bug21394_029' into maint-0.3.2Nick Mathewson2017-11-05
| |\ \ \ \
| | * | | | Fix DNS resolution on busy exit relaysSebastian Hahn2017-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Dhalgren who analyzed this issue two years ago and found a solution!
* | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-05
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ticket21031 changes file revised.Nick Mathewson2017-11-05
| | | | | |
| * | | | | ClientDNSRejectInternalAddresses in non-default networksSebastian Hahn2017-11-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once again allow the flag to be set, unless the default network is used. Thanks to nickm for a suggestion for the workaround to a test failure.
| * | | | | Undo deprecation of ClientDNSRejectInternalAddressesSebastian Hahn2017-11-04
| | | | | |
| * | | | | Revert "Make ClientDNSRejectInternalAddresses testing-only."Sebastian Hahn2017-11-04
| | |_|_|/ | |/| | | | | | | | | | | | | This reverts commit 27fa4a98d23972213122fa99499efa4baebe49e3.
* | | | | Fix rust welcome message typo.Alex Xu (Hello71)2017-11-05
| | | | |
* | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-02
|\ \ \ \ \ | |/ / / /
| * | | | nodelist: Downgrade warning to protocol warningDavid Goulet2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The node_get_ed25519_id() warning can actually be triggered by a relay flagged with NoEdConsensus so instead of triggering a warning on all relays of the network, downgrade it to protocol warning. Fixes #24025 Signed-off-by: David Goulet <dgoulet@torproject.org>
* | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-02
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'dgoulet_ticket23753_032_02_squashed' into maint-0.3.2Nick Mathewson2017-11-02
| |\ \ \ \
| | * | | | sched: Rate limit scheduler_bug_occurred()David Goulet2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just in case we end up hitting a SCHED_BUG() multiple times, rate limit the log warning. Signed-off-by: David Goulet <dgoulet@torproject.org>
| | * | | | sched: Add another SCHED_BUG() callsiteMatt Traudt2017-11-02
| | | | | |
| | * | | | sched: Use SCHED_BUG() macro in schedulerDavid Goulet2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a BUG() occurs, this macro will print extra information about the state of the scheduler and the given channel if any. This will help us greatly to fix future bugs in the scheduler especially when they occur rarely. Fixes #23753 Signed-off-by: David Goulet <dgoulet@torproject.org>
| | * | | | sched: Implement SCHED_BUG()David Goulet2017-10-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Goulet <dgoulet@torproject.org>
* | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-02
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Test that IPv6-only clients can use microdescriptorsteor2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running "make test-network-all", test that IPv6-only clients can use microdescriptors. IPv6-only microdescriptor client support was fixed in tor 0.3.0.1-alpha. Requires chutney master 61c28b9 or later. Closes ticket 24109.
* | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-11-02
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Tweak a comment for a minor but important distinctionNick Mathewson2017-11-02
| | | | | |
| * | | | | Merge branch 'ticket23820_032_01_squashed' into maint-0.3.2Nick Mathewson2017-11-02
| |\ \ \ \ \
| | * | | | | Changes file for 23820teor2017-11-02
| | | | | | |
| | * | | | | Don't run IPv6-only v3 single onion service tests using chutneyteor2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of #23820.
| | * | | | | Stop users configuring IPv6-only v3 single onion servicesteor2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are not yet implemented: they will upload descriptors, but won't be able to rendezvous, because IPv6 addresses in link specifiers are ignored. Part of #23820.
| | * | | | | Improve v3 onion service logging for intro and rend pointsteor2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Diagnostics for #23820.
| | * | | | | Remove buggy IPv6 and ed25519 handling from get_lspecs_from_extend_info()teor2017-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of this function had the following issues: * it didn't check if the extend_info contained an IPv6 address, * it didn't check if the ed25519 identity key was valid. But we can't add IPv6 support in a bugfix release. Instead, BUG() if the address is an IPv6 address, so we always put IPv4 addresses in link specifiers. And ignore missing ed25519 identifiers, rather than generating an all-zero link specifier. This supports v3 hidden services on IPv4, dual-stack, and IPv6, and v3 single onion services on IPv4 only. Part of 23820, bugfix on 0.3.2.1-alpha.
| | * | | | | Remove buggy IPv6 support from pick_intro_point() and service_intro_point_new()teor2017-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of these functions had the following issues: * they can't supply both the IPv4 and IPv6 addresses in link specifiers, * they try to fall back to a 3-hop path when the address for a direct connection is unreachable, but this isn't supported by launch_rendezvous_point_circuit(), so it fails. But we can't fix these things in a bugfix release. Instead, always put IPv4 addresses in link specifiers. And if a v3 single onion service can't reach any intro points, fail. This supports v3 hidden services on IPv4, dual-stack, and IPv6, and v3 single onion services on IPv4 only. Part of 23820, bugfix on 0.3.2.1-alpha.
| | * | | | | Remove buggy IPv6 support from hs_get_extend_info_from_lspecs()teor2017-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of this function has the following issues: * it doesn't choose between IPv4 and IPv6 addresses correctly, and * it doesn't fall back to a 3-hop path when the address for a direct connection is unreachable. But we can't fix these things in a bugfix release. Instead, treat IPv6 addresses like any other unrecognised link specifier and ignore them. If there is no IPv4 address, return NULL. This supports v3 hidden services on IPv4, dual-stack, and IPv6, and v3 single onion services on IPv4 only. Part of 23820, bugfix on 0.3.2.1-alpha.
* | | | | | | Merge branch 'buf_for_stringbuffer_squashed'Nick Mathewson2017-11-02
|\ \ \ \ \ \ \
| * | | | | | | changes file for 22342Nick Mathewson2017-11-02
| | | | | | | |
| * | | | | | | Refactor geoip_get_dirreq_history to use buf_tNick Mathewson2017-11-02
| | | | | | | |
| * | | | | | | Refactor connection_write_to_buf_impl_(); add one that takes a buf_tNick Mathewson2017-11-02
| | | | | | | |
| * | | | | | | Add a zero-copy buffer move implementation.Nick Mathewson2017-11-02
| | | | | | | |
| * | | | | | | Refactor write_http_response_header_impl() to use buf_tNick Mathewson2017-11-02
| | | | | | | |