aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-09git-install-tools: use -b, not --backup.Nick Mathewson
The osx version of this tool doesn't have --backup
2020-07-09Merge remote-tracking branch 'tor-gitlab/mr/36'Nick Mathewson
2020-07-09Merge remote-tracking branch 'tor-gitlab/mr/21'Nick Mathewson
2020-07-09Update git scripts to include tor-gitlab repositoryNick Mathewson
Analogously to tor-github, we now make a tor-gitlab repository. It is set up to disable push direct attempts, and to fetch merge requests into appropriate branches. git-pull-all.sh knows how to fetch this repository.
2020-07-09test: Add IPv6 inet_pton double "::" testDavid Goulet
Unclear but that somehow failed on Windows once (?) according to ticket #33768 but we are not seeing that failure. Nevertheless, add a simple unit test. Closes #33768 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-09addr: Static assert resolved address cache sizeDavid Goulet
This will make sure that we always properly initialize the cache by the exact size all the time. Related to #40022 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-09Merge branch 'maint-0.4.4'Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09Bump to 0.4.4.2-alpha-devNick Mathewson
2020-07-09Merge branch 'maint-0.4.3' into maint-0.4.4Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09Bump to 0.4.3.6-devNick Mathewson
2020-07-09Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09Bump to 0.4.2.8-devNick Mathewson
2020-07-09Merge branch 'maint-0.3.5' into maint-0.4.2Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09Bump to 0.3.5.11-devNick Mathewson
2020-07-09Merge branch 'maint-0.4.4'Nick Mathewson
`-s ours` to avoid version bump
2020-07-09Update version to 0.4.4.2-alpha.Nick Mathewson
2020-07-09Merge branch 'maint-0.4.3' into maint-0.4.4Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09Update version to 0.4.3.6.Nick Mathewson
2020-07-09Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09Update version to 0.4.2.8.Nick Mathewson
2020-07-09Merge branch 'maint-0.3.5' into maint-0.4.2Nick Mathewson
`-s ours` to avoid version bump.
2020-07-09bump to 0.3.5.11Nick Mathewson
2020-07-09copy changelogs and releasenotes for today's releasesNick Mathewson
2020-07-09Merge branch 'maint-0.4.4'George Kadianakis
2020-07-09Merge branch 'tor-github/pr/1989' into maint-0.4.4George Kadianakis
2020-07-09Merge branch 'maint-0.4.4'Nick Mathewson
2020-07-09Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4Nick Mathewson
2020-07-09Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-07-09Merge branch 'maint-0.3.5' into maint-0.4.2Nick Mathewson
2020-07-09Merge branch 'maint-0.4.4'Nick Mathewson
2020-07-09Merge branch 'maint-0.4.3' into maint-0.4.4Nick Mathewson
2020-07-09Merge branch 'trove_2020_001_035' into maint-0.3.5Nick Mathewson
2020-07-09hs-v3: Remove a possible BUG() conditionDavid Goulet
When receiving an introduction NACK, the client either decides to close or re-extend the circuit to another intro point. In order to do this, the service descriptor needs to exists but it is possible that it gets removed from the cache between the establishement of the introduction circuit and the reception of the (N)ACK. For that reason, the BUG(desc == NULL) is removed because it is a possible normal use case. Tor recovers gracefully already. Fixes #34087 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-09Merge branch 'maint-0.4.4'David Goulet
2020-07-09Merge branch 'tor-github/pr/1988' into maint-0.4.4David Goulet
2020-07-09Merge branch 'maint-0.4.4'David Goulet
2020-07-09Refactor setup_intro_circ_auth_key() to make it simpler.George Kadianakis
It now uses the 'goto err' pattern, instead of the fatal_unreached() pattern. The latter pattern is usually used when there is a loop, but there is no loop in this function so it can be simplified easily.
2020-07-09Handle a failure edge-case when a client-side intro circ opens.George Kadianakis
2020-07-08socks: Returns 0xF6 only if BAD_HOSTNAMEGuinness
This commit modifies the behavior of `parse_extended_address` in such a way that if it fails, it will always return a `BAD_HOSTNAME` value, which is then used to return the 0xF6 extended error code. This way, in any case that is not a valid v2 address, we return the 0xF6 error code, which is the expected behavior. Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-08addr: Initialize resolved address cache to NULL addressDavid Goulet
Related to #40022 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-08addr: Validate identity key when getting a suggestionDavid Goulet
We do look at the address but with this we also look if the identity digest of the relay suggesting us an address is a trusted source. Related to #40022 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-08Merge branch 'maint-0.4.2' into maint-0.4.3Alexander Færøy
2020-07-08Merge branch 'maint-0.4.4'Alexander Færøy
2020-07-08Merge branch 'maint-0.4.3' into maint-0.4.4Alexander Færøy
2020-07-08Merge branch 'maint-0.3.5' into maint-0.4.2Alexander Færøy
2020-07-07Resolve a compiler warning from a 32-bit signed/unsigned comparisonNick Mathewson
This warning only affects platforms (like win32) with 32-bit time_t. Fixes bug 40028; bugfix on 0.3.2.8-rc.
2020-07-07Revert "config: Make clients tell dual-stack exits they prefer IPv6"David Goulet
This reverts commit bf2a399fc0d90df76e091fa3259f7c1b8fb87781. Don't set by default the prefer IPv6 feature on client ports because it breaks the torsocks use case. The SOCKS resolve command is lacking a mechanism to ask for a specific address family (v4 or v6) thus prioritizing IPv6 when an IPv4 address is asked on the resolve SOCKS interface resulting in a failure. Tor Browser explicitly set PreferIPv6 so this should not affect the majority of our users. Closes #33796 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-07Merge remote-tracking branch 'tor-github/pr/1974/head'Nick Mathewson
2020-07-07Merge branch 'ticket33236_045_01'David Goulet
2020-07-07addr: Attempt to learn our address with ORPortDavid Goulet
If no Address statement are found in the configuration file, attempt to learn our address by looking at the ORPort address if any. Specifying an address is optional so if we can't find one, it is fine, we move on to the next discovery mechanism. Note that specifying a hostname on the ORPort is not yet supported at this commit. Closes #33236 Signed-off-by: David Goulet <dgoulet@torproject.org>
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion