summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-01Merge branch 'maint-0.3.0' into release-0.3.0tor-0.3.0.4-rcNick Mathewson
2017-03-01Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-minNick Mathewson
In that chutney test, the bridge client is configured to connect to the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no change in transports. That meant, I think, that the descriptor is only assigned to the first bridge when it arrives, and never the second.
2017-03-01Pick a dateNick Mathewson
2017-03-01Remove 21581 changes file: "bugfix not on any released Tor"Nick Mathewson
2017-03-01Reflow changelogNick Mathewson
2017-03-01Fold in changelog of bug 21415Nick Mathewson
2017-03-01Make it clear that we fixed 2 cases of 20711Nick Mathewson
2017-03-01Remove changes files that got merged to 0.3.0.4-rc changelogNick Mathewson
2017-03-01Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-03-01Improve descriptor checks in the new guard algorithm.George Kadianakis
- Make sure we check at least two guards for descriptor before making circuits. We typically use the first primary guard for circuits, but it can also happen that we use the second primary guard (e.g. if we pick our first primary guard as an exit), so we should make sure we have descriptors for both of them. - Remove BUG() from the guard_has_descriptor() check since we now know that this can happen in rare but legitimate situations as well, and we should just move to the next guard in that case.
2017-03-01Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-03-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
"Ours" merge to avoid version bump
2017-03-01Bump to 0.2.9.10-devNick Mathewson
2017-03-01Port 0.2.9.10 changelog and releasenotes to release-0.3.0Nick Mathewson
2017-03-01Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-03-01Remove the space before the interpreter name in test-network.shteor
Apparently some unixes don't like this. Part of #21581.
2017-02-28Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-03-01Remove a spurious test-network-all warning that triggers when sh is not bashteor
Part of 21581.
2017-03-01Restore support for test-network.sh on BSD and other systems without bashteor
(But use bash if it's available.) This is a workaround until we remove bash-specific code in 19699. Fixes bug 21581; bugfix on 21562, not in any released version of tor.
2017-02-28Merge branch 'maint-0.3.0' into release-0.3.0Nick Mathewson
2017-02-28bump version to 0.3.0.4-rcNick Mathewson
2017-02-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
This is an "ours" merge to avoid a version bump.
2017-02-28bump version to 0.2.9.10Nick Mathewson
2017-02-28Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
This is an "ours" merge to avoid taking a version bump
2017-02-28Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
This is an "ours" merge to avoid taking a version bump, and to avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.
2017-02-28bump version to 0.2.8.13Nick Mathewson
2017-02-28Bump version to 0.2.7.7Nick Mathewson
2017-02-28Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
"ours" merge to avoid version bumps
2017-02-28bump to 0.2.6.11Nick Mathewson
2017-02-28Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
"ours" merge to avoid version bumps
2017-02-28Bump version to 0.2.5.13Nick Mathewson
2017-02-28Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
"ours" merge to avoid bumping version
2017-02-28Bump to 0.2.4.28Nick Mathewson
2017-02-28More changelog editsNick Mathewson
2017-02-28rewrite a little.Nick Mathewson
2017-02-28Reflow 0.3.0.4-rc changelogNick Mathewson
2017-02-28sort changes into 0.3.0.4-rc changelogNick Mathewson
2017-02-28appease lintchangesNick Mathewson
2017-02-28Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0Nick Mathewson
2017-02-28Merge branch 'bug21027_v2_squashed' into maint-0.3.0Nick Mathewson
2017-02-28Change approach to preventing duplicate guards.Nick Mathewson
Previously I'd made a bad assumption in the implementation of prop271 in 0.3.0.1-alpha: I'd assumed that there couldn't be two guards with the same identity. That's true for non-bridges, but in the bridge case, we allow two bridges to have the same ID if they have different addr:port combinations -- in order to have the same bridge ID running multiple PTs. Fortunately, this assumption wasn't deeply ingrained: we stop enforcing the "one guard per ID" rule in the bridge case, and instead enforce "one guard per <id,addr,port>". We also needed to tweak our implementation of get_bridge_info_for_guard, since it made the same incorrect assumption. Fixes bug 21027; bugfix on 0.3.0.1-alpha.
2017-02-27Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0Nick Mathewson
2017-02-27Merge branch 'bug21369_check_029_squashed' into maint-0.3.0Nick Mathewson
2017-02-27Merge branch 'bug21420_029_squashed' into maint-0.3.0Nick Mathewson
2017-02-27Revise the logic for picking the start time for link certsNick Mathewson
Since 0.2.4.11-alpha (in 0196647970a91d) we've tried to randomize the start time to up to some time in the past. But unfortunately we allowed the start time to be in the future as well, which isn't really legit. The new behavior lets the start time be be up to MAX(cert_lifetime-2days, 0) in the past, but never in the future. Fixes bug 21420; bugfix on 0.2.4.11-alpha.
2017-02-27Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0Nick Mathewson
2017-02-28Use bash in src/test/test-network.shteor
This ensures we reliably call chutney's newer tools/test-network.sh when available. Fixes bug 21562; bugfix on tor-0.2.9.1-alpha.
2017-02-28Reserve a test-network.sh exit status of 2 for unknown argumentsteor
Part of 21570.
2017-02-28Log tor warnings during 'make test-network-all'teor
Requires the chutney changes from 21572. (Otherwise, asks users to upgrade their chutney.) Implements 21570.
2017-02-27Add one other BUG check to try to fix/solve 21369.Nick Mathewson
Teor thinks that this connection_dirserv_add_dir_bytes_to_outbuf() might be the problem, if the "remaining" calculation underflows. So I'm adding a couple of checks there, and improving the casts.