summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-29last minute fixestor-0.3.1.4-alphaNick Mathewson
2017-06-29add an article, fix a double-word, mention a ticket.Nick Mathewson
2017-06-29changelog: logic correctionNick Mathewson
2017-06-29changelog: typo fix.Nick Mathewson
2017-06-29changelog: drop inconsistent parens.Nick Mathewson
2017-06-29Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-06-29Bump 0.3.1 to 0.3.1.4-alphaNick Mathewson
2017-06-29Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump.
2017-06-29Update maint-0.3.0 to 0.3.0.9Nick Mathewson
2017-06-29"Relay" in changelog, not "node"Nick Mathewson
2017-06-29Edit and reflow the changelog.Nick Mathewson
2017-06-29Fold in changes entry for 22753, and write a blurb.Nick Mathewson
2017-06-29Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-29Merge branch 'maint-0.3.1' into release-0.3.1Nick Mathewson
2017-06-29Merge branch 'trove-2017-006' into maint-0.3.0Nick Mathewson
2017-06-29Run format-changes script to reflow changelog.Nick Mathewson
2017-06-29Sort changes into changelog file for 0.3.1.4-alphaNick Mathewson
2017-06-29Add "New dependencies" as a recognized lintchanges categoryNick Mathewson
2017-06-29lintchanges fix: add a categoryNick Mathewson
2017-06-29lintchanges fix: mention the ticket number.Nick Mathewson
2017-06-29Lintchanges fix: bug numbers do not get #d, but they do get "fix on"Nick Mathewson
2017-06-29Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1Nick Mathewson
2017-06-29Adjust unit tests to account for fix to bug 22753.Nick Mathewson
Our mock network put all the guards on the same IPv4 address, which doesn't fly when we start applying EnforceDistinctSubnets. So in this commit, I disable EnforceDistinctSubnets when running the old guard_restriction_t test. This commit also adds a regression test for #22753.
2017-06-29Consider the exit family when applying guard restrictions.Nick Mathewson
When the new path selection logic went into place, I accidentally dropped the code that considered the _family_ of the exit node when deciding if the guard was usable, and we didn't catch that during code review. This patch makes the guard_restriction_t code consider the exit family as well, and adds some (hopefully redundant) checks for the case where we lack a node_t for a guard but we have a bridge_info_t for it. Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006 and CVE-2017-0377.
2017-06-28Changes file for bug22752 diagnosticsNick Mathewson
2017-06-28Log real error message when unable to remove a storagedir fileNick Mathewson
Attempts to help diagnose 22752.
2017-06-28Replace crash on missing handle in consdiffmgr with nonfatal assertNick Mathewson
Attempts to mitigate 22752.
2017-06-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9Nick Mathewson
2017-06-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9Nick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid taking redundant ws fix
2017-06-28whitespace fixNick Mathewson
2017-06-28Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"Ours" merge to avoid taking backport of 21969
2017-06-28Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0Nick Mathewson
2017-06-28Fix crash in LZMA module when the Sandbox is enabled.Alexander Færøy
This patch fixes a crash in our LZMA module where liblzma will allocate slightly more data than it is allowed to by its limit, which leads to a crash. See: https://bugs.torproject.org/22751
2017-06-27Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1Nick Mathewson
2017-06-27Add changes file for bug #22702.Alexander Færøy
See: https://bugs.torproject.org/22702
2017-06-27Return "304 not modified" if a client already have the most recent consensus.Alexander Færøy
This makes our directory code check if a client is trying to fetch a document that matches a digest from our latest consensus document. See: https://bugs.torproject.org/22702
2017-06-27Set published_out for consensus cache entries in ↵Alexander Færøy
spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the current consensus cache entry's "valid after" field. See: https://bugs.torproject.org/22702
2017-06-27Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-27Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-27Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-27Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-27Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-27Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-27Merge branch 'bug22737_024' into maint-0.2.4Nick Mathewson