Commit Graph

19075 Commits

Author SHA1 Message Date
Nick Mathewson 279fa65d34 Merge branch 'maint-0.2.5' into release-0.2.5 2018-04-05 08:22:33 -04:00
Karsten Loesing 1fa396b0a4 Update geoip and geoip6 to the April 3 2018 database. 2018-04-05 10:42:25 +02:00
Nick Mathewson 1d281eb933 Merge branch 'maint-0.2.5' into release-0.2.5 2018-03-19 05:42:43 -04:00
Nick Mathewson 0eb2cdf99d Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 2018-03-19 05:42:38 -04:00
Nick Mathewson 0d63a60643 Merge branch 'maint-0.2.5' into release-0.2.5 2018-03-13 10:58:02 -04:00
Karsten Loesing 3418a3a7f0 Update geoip and geoip6 to the March 8 2018 database. 2018-03-13 10:57:49 -04:00
Taylor Yu 09484b9449 Document how to allow partial Travis failures
Add some commented-out allow_failures clauses to make it easier to
temporarily allow less-critical sub-builds to fail while still
reporting success.
2018-03-01 13:18:33 -06:00
Nick Mathewson b2c220a623 Merge branch 'maint-0.2.5' into release-0.2.5 2018-02-08 10:29:05 -05:00
Karsten Loesing f1278b7e57 Update geoip and geoip6 to the February 7 2018 database. 2018-02-08 10:32:41 +01:00
Nick Mathewson 7d1d868ea0 Merge branch 'maint-0.2.5' into release-0.2.5 2018-01-19 10:18:59 -05:00
Taylor Yu 49de586add Work around Travis CI ptrace regression
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly.  Set "sudo: required" to force non-container builds for
clang and work around this.
2018-01-17 13:40:34 -06:00
Nick Mathewson e212c752f2 Merge branch 'maint-0.2.5' into release-0.2.5 2018-01-08 09:34:56 -05:00
Karsten Loesing 8efbeb0982 Update geoip and geoip6 to the January 5 2018 database. 2018-01-08 11:36:38 +01:00
Nick Mathewson eb0c7ab433 Merge branch 'maint-0.2.5' into release-0.2.5 2017-12-21 10:58:20 -05:00
Nick Mathewson 9202087760 Merge branch 'bug24666_squashed_025' into maint-0.2.5 2017-12-21 10:40:10 -05:00
Nick Mathewson cd1f708a7f Move free to end of test function so coverity won't complain. 2017-12-21 10:39:29 -05:00
Nick Mathewson 520cf21793 Move destroy cells into a separate queue type of their own, to save RAM
We've been seeing problems with destroy cells queues taking up a
huge amount of RAM.  We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.

Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.
2017-12-21 10:29:01 -05:00
Nick Mathewson ba0c0ef771 Merge branch 'maint-0.2.5' into release-0.2.5 2017-12-20 12:15:23 -05:00
Karsten Loesing 428f8a375b Update geoip and geoip6 to the December 6 2017 database. 2017-12-20 17:36:29 +01:00
Nick Mathewson beeeeb0afa Merge branch 'maint-0.2.5' into release-0.2.5 2017-12-11 16:56:31 -05:00
Nick Mathewson 1deda2106b Merge branch 'bug24167_025' into maint-0.2.5 2017-12-11 16:56:28 -05:00
Nick Mathewson ca19b2115a Merge branch 'maint-0.2.5' into release-0.2.5 2017-12-11 16:53:07 -05:00
Nick Mathewson f5d4bdf305 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 2017-12-11 16:53:02 -05:00
Nick Mathewson 20ca62ffb5 Merge branch 'maint-0.2.5' into release-0.2.5 2017-12-01 12:13:39 -05:00
Nick Mathewson 461e34bb3d Fix a clang compilation warning in rendservice.c
Fixes bug 24480; bugfix on 0.2.5.16.
2017-12-01 12:13:15 -05:00
Nick Mathewson 9cb1c2b4ad Merge branch 'maint-0.2.5' into release-0.2.5 2017-12-01 09:35:43 -05:00
Nick Mathewson 162a087e5f bump to 0.2.5.16-dev 2017-12-01 09:33:41 -05:00
Nick Mathewson 7d83cfb3ab copy changelog to releasenotes 2017-12-01 09:14:18 -05:00
Nick Mathewson b97fb313a9 changelog for 0.2.5.16 2017-11-30 15:26:33 -05:00
Nick Mathewson 4902cfcf19 Merge branch 'maint-0.2.5' into release-0.2.5 2017-11-30 12:28:39 -05:00
Nick Mathewson 6bda6777c1 bump to 0.2.5.16 2017-11-30 12:19:48 -05:00
Nick Mathewson 6d0f332a2e Merge branch 'maint-0.2.5' into release-0.2.5 2017-11-30 12:07:59 -05:00
Nick Mathewson f49876d66e Merge branch 'trove-2017-012_025' into maint-0.2.5 2017-11-30 12:06:21 -05:00
Nick Mathewson 08ce39fb0f Merge branch 'trove-2017-011_025' into maint-0.2.5 2017-11-30 12:06:17 -05:00
Nick Mathewson a6a0c7a4ec Merge branch 'trove-2017-009_025' into maint-0.2.5 2017-11-30 12:05:59 -05:00
Nick Mathewson 75509dc827 Fix changes file 2017-11-30 11:52:40 -05:00
David Goulet 6ab07419c8 Use local descriptor object to exclude self in path selection
TROVE-2017-12. Severity: Medium

When choosing a random node for a circuit, directly use our router
descriptor to exclude ourself instead of the one in the global
descriptor list. That list could be empty because tor could be
downloading them which could lead to not excluding ourself.

Closes #21534
2017-11-28 19:14:10 -05:00
Nick Mathewson 1880a6a88e Avoid asking for passphrase on junky PEM input
Fixes bug 24246 and TROVE-2017-011.

This bug is so old, it's in Matej's code.  Seems to have been
introduced with e01522bbed.
2017-11-27 15:25:03 -05:00
Nick Mathewson 2834cc9c18 Fix length of replaycache-checked data.
This is a regression; we should have been checking only the
public-key encrypted portion.  Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.
2017-11-27 15:12:19 -05:00
David Goulet 8be50ca3ea relay: Change bandwidth stats interval to 24 hours
Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.

Closes #23856

Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-27 10:00:40 -05:00
Nick Mathewson 6177674a5b Merge branch 'maint-0.2.5' into release-0.2.5 2017-11-18 11:03:16 -05:00
Nick Mathewson 831d3b794d Merge branch 'ticket18329_minimal_025' into maint-0.2.5 2017-11-18 11:00:45 -05:00
Nick Mathewson 95238eb917 Fix a traceback when closing a blocked connection "immediately".
When we close a connection via connection_close_immediately, we kill
its events immediately. But if it had been blocked on bandwidth
read/write, we could try to re-add its (nonexistent) events later
from connection_bucket_refill -- if we got to that callback before
we swept the marked connections.

Fixes bug 24167.  Fortunately, this hasn't been a crash bug since we
introduced connection_check_event in 0.2.9.10, and backported it.

This is a bugfix on commit 89d422914a, I believe, which
appeared in Tor 0.1.0.1-rc.
2017-11-16 12:05:56 -05:00
Nick Mathewson 9f2efd02a1 Minimal implementation of bridge-distribution-request
Just advertise the line when we're a bridge, using "any" if we're
published or "none" if we aren't.

This is done in lieu of a full backport of #18329.
2017-11-13 20:44:51 -05:00
Nick Mathewson e26f387026 Merge branch 'maint-0.2.5' into release-0.2.5 2017-11-11 12:23:33 -05:00
Karsten Loesing 6f8c32b7de Update geoip and geoip6 to the November 6 2017 database. 2017-11-10 10:14:09 +01:00
Nick Mathewson 765fd0845f Merge branch 'maint-0.2.5' into release-0.2.5 2017-10-25 09:29:00 -04:00
Nick Mathewson 82f8b27ff5 bump to 0.2.5.15-dev 2017-10-25 09:26:53 -04:00
Nick Mathewson 5a0e73c75b Set a date; make releasenotes (025) 2017-10-25 08:07:19 -04:00
Nick Mathewson 078604630d Merge branch 'maint-0.2.5' into release-0.2.5 2017-10-24 09:10:42 -04:00