summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-15Bump to 0.4.7.0-alpha-devtor-0.4.7.0-alpha-devNick Mathewson
2021-04-15Merge branch 'maint-0.4.6'Nick Mathewson
"ours" to avoid version bump.
2021-04-15Bump to 0.4.6.2-alpha-devNick Mathewson
2021-04-15Add 0.4.6 to git-list-tor-branches.shNick Mathewson
2021-04-14two more changelog fixes from armator-0.4.6.2-alphaNick Mathewson
2021-04-14changelog edits from armaNick Mathewson
2021-04-14light changelog editsNick Mathewson
2021-04-14Start a changes file for 0.4.6.2-alphaNick Mathewson
2021-04-14Bump version to 0.4.6.2-alpha.Nick Mathewson
2021-04-14geoip script: add options to output AS numbers.Nick Mathewson
The --include-asn option includes AS numbers in the geoip mapping. The --output-asn option makes the program generate a number-to-name mapping file. Additionally, the script now outputs ?? CC entries for networks that are listed but which have no country known.
2021-04-14Merge branch 'maint-0.4.5'David Goulet
2021-04-14Merge branch 'maint-0.4.4' into maint-0.4.5David Goulet
2021-04-14Merge branch 'maint-0.3.5' into maint-0.4.4David Goulet
2021-04-14fallbackdir: Remove two unspec linesDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-13Merge branch 'maint-0.4.5'Nick Mathewson
2021-04-13Merge branch 'maint-0.4.4' into maint-0.4.5Nick Mathewson
2021-04-13Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-04-13fallbackdir: Renegerate list with 200 relaysDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-13relay: Move "overload-general" from extra-info to server descriptor.Alexander Færøy
Fixes #40364 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-13Merge branch 'maint-0.4.4' into maint-0.4.5Nick Mathewson
2021-04-13Merge branch 'maint-0.4.5'Nick Mathewson
2021-04-13Merge branch 'maint-0.3.5' into maint-0.4.4Nick Mathewson
2021-04-13Update geoip files to match ipfire location db, 2021/04/13.Nick Mathewson
2021-04-13Merge branch 'maint-0.4.5'Nick Mathewson
2021-04-12scripts: Add default include path to ccls generated fileDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-08guard: Don't check bridge transport name when selecting eligible guardsDavid Goulet
This is related to ticket #40360 which found this problem when a Bridge entry with a transport name (let say obfs4) is set without a fingerprint: Bridge obfs4 <IP>:<PORT> cert=<...> iat-mode=0 (Notice, no fingerprint between PORT and "cert=") Problem: commit 09c6d0324626ffa349c7eed66d9ede92ecd71583 added a check in get_sampled_guard_for_bridge() that would return NULL if the selected bridge did not have a valid transport name (that is the Bridge transport name that corresponds to a ClientTransportPlugin). Unfortuantely, this function is also used when selecting our eligible guards which is done *before* the transport list is populated and so the added check for the bridge<->transport name is querying an empty list of transports resulting in always returning NULL. For completion, the logic is: Pick eligible guards (use bridge(s) if need be) then for those, initiate a connection to the pluggable transport proxy and then populate the transport list once we've connected. Back to get_sampled_guard_for_bridge(). As said earlier, it is used when selecting our eligible guards in a way that prevents us from selecting duplicates. In other words, if that function returns non-NULL, the selection continues considering the bridge was sampled before. But if it returns NULL, the relay is added to the eligible list. This bug made it that our eligible guard list was populated with the *same* bridge 3 times like so (remember no fingerprint): [info] entry_guards_update_primary(): Primary entry guards have changed. New primary guard list is: [info] entry_guards_update_primary(): 1/3: [bridge] ($0000000000000000000000000000000000000000) [info] entry_guards_update_primary(): 2/3: [bridge] ($0000000000000000000000000000000000000000) [info] entry_guards_update_primary(): 3/3: [bridge] ($0000000000000000000000000000000000000000) When tor starts, it will find the bridge fingerprint by connecting to it and will then update the primary guard list by calling entry_guard_learned_bridge_identity() which then goes and update only 1 single entry resulting in this list: [debug] sampled_guards_update_consensus_presence(): Sampled guard [bridge] ($<FINGERPRINT>) is still listed. [debug] sampled_guards_update_consensus_presence(): Sampled guard [bridge] ($0000000000000000000000000000000000000000) is still listed. [debug] sampled_guards_update_consensus_presence(): Sampled guard [bridge] ($0000000000000000000000000000000000000000) is still listed. And here lies the problem, now tor is stuck attempting to wait for a valid descriptor for at least 2 guards where the second one is a bunch of zeroes and thus tor will never fully bootstraps: [info] I learned some more directory information, but not enough to build a circuit: We're missing descriptors for 1/2 of our primary entry guards (total microdescriptors: 6671/6703). That's ok. We will try to fetch missing descriptors soon. Now, why passing the fingerprint then works? This is because the list of guards contains 3 times the same bridge but they all have a fingerprint and so the descriptor can be found and tor can bootstraps. The solution here is to entirely remove the transport name check in get_sampled_guard_for_bridge() since the transport_list is empty at that point. That way, the eligible guard list only gets 1 entry, the bridge, and can then go on to bootstrap properly. It is OK to do so since when launching a bridge descriptor fetch, we validate that the bridge transport name is OK and thus avoid connecting to a bridge without a ClientTransportPlugin. If we wanted to keep the check in place, we would need to populate the transport_list much earlier and this would require a much bigger refactoring. Fixes #40360 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-08Merge remote-tracking branch 'tor-gitlab/mr/354'George Kadianakis
2021-04-08Merge branch 'maint-0.4.5'George Kadianakis
2021-04-08Merge remote-tracking branch 'tor-gitlab/mr/273'George Kadianakis
2021-04-05Merge remote-tracking branch 'tor-gitlab/mr/345'George Kadianakis
2021-04-02src/config/README: add documentation for geoip format.Nick Mathewson
2021-03-30Add two new test vectors for ed25519 key blinding.George Kadianakis
- Also fix the vector producing script to work with python3.
2021-03-28Add long format name --torrc-file for command line option -f. #40324Daniel Pinto
2021-03-26Fix glob processing on BSD systems. #40318Daniel Pinto
On Linux systems, glob automatically ignores the errors ENOENT and ENOTDIR because they are expected during glob expansion. But BSD systems do not ignore these, resulting in glob failing when globs expand to invalid paths. This is fixed by adding a custom error handler that ignores only these two errors and removing the GLOB_ERR flag as it makes glob fail even if the error handler ignores the error and is unnecessary as the error handler will make glob fail on all other errors anyway.
2021-03-24Avoid unused function warnings on libc's without GLOB_ALTDIRFUNC #40354Daniel Pinto
2021-03-24fix up the keypinning commentsRoger Dingledine
2021-03-24fix some tiny typosRoger Dingledine
2021-03-24Merge branch 'maint-0.4.4' into maint-0.4.5Nick Mathewson
2021-03-24Merge branch 'maint-0.4.5'Nick Mathewson
2021-03-24Merge remote-tracking branch 'tor-gitlab/mr/339'Nick Mathewson
2021-03-24Retroactively add a missing changelog entry for v2 hs removalNick Mathewson
Closes #40348.
2021-03-24Merge remote-tracking branch 'tor-gitlab/mr/343'George Kadianakis
2021-03-23Merge branch 'tor-gitlab/mr/337'David Goulet
2021-03-23Add a DormantTimeoutEnabled to disable dormant mode entirelyNick Mathewson
(If you need to do this in an older version you can just set DormantClientTimeout to something huge.) Closes #40228.
2021-03-23channel: Fix use after free in channel_do_open_actions()David Goulet
Fortunately, our tor_free() is setting the variable to NULL after so we were in a situation where NULL was always used instead of the transport name. This first appeared in 894ff2dc8422cb86312c512698acd76476224f87 and results in basically no bridge with a transport being able to use DoS defenses. Fixes #40345 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-23man: HiddenServiceStatistics applies for bridgesDavid Goulet
Closes #40346 Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-03-23Merge branch 'tor-gitlab/mr/342'David Goulet
2021-03-22manpage:Move BridgeRecordUsageByCountry to statistics sectionNick Mathewson
patch from cypherpunks; closes #40323
2021-03-22Improve the man page entry for Address.George Kadianakis
Fixes bug #40296 .
2021-03-19Add "Heartbeat" to the start of several heartbeat messages.Nick Mathewson
Closes #40322.