]>
git.ipfire.org Git - thirdparty/tor.git/log
Nick Mathewson [Wed, 23 Aug 2017 14:22:51 +0000 (10:22 -0400)]
Don't do expensive consensus stuff when not a cache.
This includes generating and storing compressed consensuses, and
consensus diffs. Fixes bug 23275; bugfix on 0.3.1.1-alpha.
Nick Mathewson [Mon, 21 Aug 2017 19:06:39 +0000 (15:06 -0400)]
Merge branch 'bug23291_028' into maint-0.3.1
Nick Mathewson [Mon, 21 Aug 2017 19:04:35 +0000 (15:04 -0400)]
changes file for bug 23291
Ties Stuij [Sun, 13 Aug 2017 15:55:45 +0000 (17:55 +0200)]
22839: fix check_heap_buffer buffer size in test-memwipe
Nick Mathewson [Mon, 21 Aug 2017 18:18:41 +0000 (14:18 -0400)]
whitespace fixes
George Kadianakis [Thu, 17 Aug 2017 20:13:15 +0000 (23:13 +0300)]
Fix triggerable BUG() when decoding hsv3 descriptors.
Also improve the unittest to make sure it catches the right error.
George Kadianakis [Thu, 17 Aug 2017 20:12:59 +0000 (23:12 +0300)]
Add unittest for #23233.
This will fail currently since the bug is not fixed yet.
Nick Mathewson [Wed, 9 Aug 2017 00:07:39 +0000 (20:07 -0400)]
Use a single free-and-exit strategy in config_process_include.
This avoids a double-free when a pointer already freed with
tor_free(config_line) is freed again in the cleanup-and-exit code.
Fixes bug 23155.
Nick Mathewson [Tue, 8 Aug 2017 23:29:05 +0000 (19:29 -0400)]
Merge branch 'bug23139' into maint-0.3.1
Nick Mathewson [Tue, 8 Aug 2017 14:09:54 +0000 (10:09 -0400)]
chages file on 22286
Nick Mathewson [Tue, 8 Aug 2017 14:08:06 +0000 (10:08 -0400)]
Remove some LCOV_EXCL stuff that I think may be testable after all.
This is partial revert on 22286.
Also, tweak some log messages to be distinct.
Nick Mathewson [Tue, 8 Aug 2017 14:03:08 +0000 (10:03 -0400)]
Merge remote-tracking branch 'ahf/bugs/22286' into maint-0.3.1
Nick Mathewson [Tue, 8 Aug 2017 13:12:09 +0000 (09:12 -0400)]
Fix a memory leak in consdiffmgr.c
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
Nick Mathewson [Thu, 3 Aug 2017 13:14:12 +0000 (09:14 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 3 Aug 2017 13:12:23 +0000 (09:12 -0400)]
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
Nick Mathewson [Thu, 3 Aug 2017 13:10:58 +0000 (09:10 -0400)]
Merge branch 'bug23081_025' into maint-0.3.1
Nick Mathewson [Thu, 3 Aug 2017 13:07:28 +0000 (09:07 -0400)]
In ntmain, call set_main_thread() before running the loop.
Patch from Vort; fixes bug 23081; bugfix on
fd992deeea76972 in
0.2.1.16-rc when set_main_thread() was introduced.
See the changes file for a list of all the symptoms this bug has
been causing when running Tor as a Windows Service.
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)]
Merge branch 'maint-0.2.5' into maint-0.2.8
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 3 Aug 2017 12:44:31 +0000 (08:44 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Karsten Loesing [Thu, 3 Aug 2017 08:00:54 +0000 (10:00 +0200)]
Update geoip and geoip6 to the August 3 2017 database.
Nick Mathewson [Wed, 2 Aug 2017 16:51:42 +0000 (12:51 -0400)]
Merge branch 'bug23071_031' into maint-0.3.1
Nick Mathewson [Wed, 2 Aug 2017 16:44:39 +0000 (12:44 -0400)]
Make the hs_ntor_ref logic more correct when there is no sha3 module
Nick Mathewson [Wed, 2 Aug 2017 16:28:43 +0000 (12:28 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid version bump.
Nick Mathewson [Wed, 2 Aug 2017 16:28:34 +0000 (12:28 -0400)]
version bump to 0.3.0.10-dev
Nick Mathewson [Tue, 1 Aug 2017 18:38:57 +0000 (14:38 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
"Ours merge" to avoid version bump.
Nick Mathewson [Tue, 1 Aug 2017 18:38:49 +0000 (14:38 -0400)]
Bump to 0.3.0.10
David Goulet [Tue, 1 Aug 2017 18:15:47 +0000 (14:15 -0400)]
hs: Cleanup logging statement in hs_intropoint.c
One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.
It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html
Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.
Fixes #23078.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Tue, 1 Aug 2017 16:08:30 +0000 (12:08 -0400)]
bump to 0.3.1.5-alpha-dev
Nick Mathewson [Tue, 1 Aug 2017 15:30:33 +0000 (11:30 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:30:33 +0000 (11:30 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 1 Aug 2017 15:30:29 +0000 (11:30 -0400)]
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:28:40 +0000 (11:28 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 1 Aug 2017 15:28:39 +0000 (11:28 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:28:36 +0000 (11:28 -0400)]
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:24:09 +0000 (11:24 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 1 Aug 2017 15:24:02 +0000 (11:24 -0400)]
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:23:01 +0000 (11:23 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 1 Aug 2017 15:23:00 +0000 (11:23 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:22:42 +0000 (11:22 -0400)]
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:21:19 +0000 (11:21 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 1 Aug 2017 15:21:19 +0000 (11:21 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:21:14 +0000 (11:21 -0400)]
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:19:30 +0000 (11:19 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 1 Aug 2017 15:19:30 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Tue, 1 Aug 2017 15:19:29 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 1 Aug 2017 15:19:28 +0000 (11:19 -0400)]
Merge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 1 Aug 2017 15:19:24 +0000 (11:19 -0400)]
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
Nick Mathewson [Tue, 1 Aug 2017 00:28:42 +0000 (20:28 -0400)]
Fix the hs_ntor integration tests to work with the pysha3 module
The sha3 module should still work. Fixes bug 23071; bugfix on
0.3.1.1-alpha.
Nick Mathewson [Mon, 31 Jul 2017 18:29:33 +0000 (14:29 -0400)]
Bump to 0.3.1.5-alpha
Nick Mathewson [Fri, 28 Jul 2017 13:52:34 +0000 (09:52 -0400)]
Fix an unreachable memory leak in the unit tests
This is CID
1415726 .
Nick Mathewson [Fri, 28 Jul 2017 13:50:16 +0000 (09:50 -0400)]
Merge branch 'bug23053_029' into maint-0.3.1
Nick Mathewson [Fri, 28 Jul 2017 13:49:42 +0000 (09:49 -0400)]
Fix a small memory leak when parsing unix: ports twice
Fixes bug 23053; CID
1415725 .
Nick Mathewson [Fri, 28 Jul 2017 00:32:59 +0000 (20:32 -0400)]
Try to work around a compile warning in workqueue.c
Nick Mathewson [Thu, 27 Jul 2017 20:29:34 +0000 (16:29 -0400)]
Merge branch 'multi-priority_squashed' into maint-0.3.1
Nick Mathewson [Thu, 27 Jul 2017 20:18:40 +0000 (16:18 -0400)]
Fix the cpuworker.c documentation to mention all the kinds of work
Nick Mathewson [Thu, 27 Jul 2017 20:11:58 +0000 (16:11 -0400)]
Note that threadpool_queue_work...() can't actually return NULL
Nick Mathewson [Wed, 12 Jul 2017 16:23:33 +0000 (12:23 -0400)]
Always start with one additional worker thread
Now that half the threads are permissive and half are strict, we
need to make sure we have at least two threads, so that we'll
have at least one of each kind.
Nick Mathewson [Wed, 12 Jul 2017 16:17:51 +0000 (12:17 -0400)]
Queue consensus diffs at LOW priority.
Fixes bug 22883.
Nick Mathewson [Wed, 12 Jul 2017 15:52:13 +0000 (11:52 -0400)]
Fix a pair of stale comments in workqueue.c
These comments said that each thread had a separate queue, but we
haven't been using that design for some while.
Nick Mathewson [Wed, 12 Jul 2017 16:18:33 +0000 (12:18 -0400)]
Make the chance for priority inversion thread-specific
Instead of choosing a lower-priority job with a 1/37 chance, have
the chance be 1/37 for half the threads, and 1/
2147483647 for the
other half. This way if there are very slow jobs of low priority,
they shouldn't be able to grab all the threads when there is better
work to do.
Nick Mathewson [Wed, 12 Jul 2017 15:47:01 +0000 (11:47 -0400)]
Add support for multi-priority workqueues
Each piece of queued work now has an associated priority value; each
priority goes on a separate queue.
With probability (N-1)/N, the workers will take work from the highest
priority nonempty queue. Otherwise, they'll look for work in a
queue of lower priority. This behavior is meant to prevent
starvation for lower-priority tasks.
Nick Mathewson [Thu, 27 Jul 2017 12:23:37 +0000 (08:23 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 27 Jul 2017 12:23:36 +0000 (08:23 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 27 Jul 2017 12:23:34 +0000 (08:23 -0400)]
Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)]
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)]
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)]
Merge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)]
Merge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:39:50 +0000 (15:39 -0400)]
Point travis to #tor-ci, not #tor-bots
Nick Mathewson [Wed, 26 Jul 2017 19:38:23 +0000 (15:38 -0400)]
Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 19:37:53 +0000 (15:37 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
This is an "ours" merge to avoid taking any changs from maint-0.3.0:
we don't want to take the travis file, since there is a separate branch
for putting it in 0.3.1 and later.
Nick Mathewson [Wed, 26 Jul 2017 19:37:06 +0000 (15:37 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 19:37:00 +0000 (15:37 -0400)]
Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:35:17 +0000 (15:35 -0400)]
Merge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:35:07 +0000 (15:35 -0400)]
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Wed, 26 Jul 2017 19:35:01 +0000 (15:35 -0400)]
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Wed, 26 Jul 2017 19:34:56 +0000 (15:34 -0400)]
Merge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 26 Jul 2017 19:34:40 +0000 (15:34 -0400)]
Merge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 16:58:22 +0000 (12:58 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 16:58:22 +0000 (12:58 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 16:58:17 +0000 (12:58 -0400)]
Merge branch 'bug23030_029_v2' into maint-0.2.9
Nick Mathewson [Tue, 25 Jul 2017 14:14:24 +0000 (10:14 -0400)]
Fix build warnings from Coverity related to our BUG macro
In the Linux kernel, the BUG() macro causes an instant panic. Our
BUG() macro is different, however: it generates a nonfatal assertion
failure, and is usable as an expression.
Additionally, this patch tells util_bug.h to make all assertion
failures into fatal conditions when we're building with a static
analysis tool, so that the analysis tool can look for instances
where they're reachable.
Fixes bug 23030.
Nick Mathewson [Wed, 26 Jul 2017 16:54:37 +0000 (12:54 -0400)]
Merge branch 'bug22927_031' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 16:53:38 +0000 (12:53 -0400)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 16:53:38 +0000 (12:53 -0400)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 16:53:13 +0000 (12:53 -0400)]
Merge branch 'bug22915_029_2' into maint-0.2.9
Nick Mathewson [Thu, 13 Jul 2017 21:42:04 +0000 (17:42 -0400)]
Suppress clang4-specific -Wdouble-promotion warnings
Wow, it sure seems like some compilers can't implement isnan() and
friends in a way that pleases themselves!
Fixes bug 22915. Bug trigged by 0.2.8.1-alpha and later; caused by
clang 4.
Isis Lovecruft [Tue, 25 Jul 2017 01:03:15 +0000 (01:03 +0000)]
In < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.
Isis Lovecruft [Mon, 24 Jul 2017 23:07:09 +0000 (23:07 +0000)]
Builds on CI should use --enable-fragile-hardening.
(cherry picked from commit
c91a57ccf90308c6728184b43519f96b61acb95d )
Isis Lovecruft [Mon, 24 Jul 2017 20:25:25 +0000 (20:25 +0000)]
Only install Rust in CI if RUST_OPTIONS is set.
(cherry picked from commit
e5dd07a4c64fd2a4132ab1f6dec64640a95da35e )
Isis Lovecruft [Mon, 24 Jul 2017 18:53:18 +0000 (18:53 +0000)]
Install optional dependencies during Travis CI builds.
(cherry picked from commit
1bb00fb812c0df7a574ed62e9f53b0e8192c7d04 )
Isis Lovecruft [Mon, 24 Jul 2017 18:26:36 +0000 (18:26 +0000)]
Fix CI homebrew checks for outdated packages.
(cherry picked from commit
8f8689f70235dc19cbc5092ea148af5772a9cdc3 )