]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoCoverity deadcode shenanigans on BUG() macro.
Nick Mathewson [Fri, 28 Jul 2017 14:02:38 +0000 (10:02 -0400)] 
Coverity deadcode shenanigans on BUG() macro.

We don't actually want Coverity to complain when a BUG() check can
never fail, since such checks can prevent us from introducing bugs
later on.

Closes ticket 23054. Closes CID 14157201415724.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Fri, 28 Jul 2017 13:54:39 +0000 (09:54 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoFix an unreachable memory leak in the unit tests
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.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Fri, 28 Jul 2017 13:50:26 +0000 (09:50 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug23053_029' into maint-0.3.1
Nick Mathewson [Fri, 28 Jul 2017 13:50:16 +0000 (09:50 -0400)] 
Merge branch 'bug23053_029' into maint-0.3.1

8 years agoFix a small memory leak when parsing unix: ports twice
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.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Fri, 28 Jul 2017 00:33:01 +0000 (20:33 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoTry to work around a compile warning in workqueue.c
Nick Mathewson [Fri, 28 Jul 2017 00:32:59 +0000 (20:32 -0400)] 
Try to work around a compile warning in workqueue.c

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 27 Jul 2017 20:30:52 +0000 (16:30 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'multi-priority_squashed' into maint-0.3.1
Nick Mathewson [Thu, 27 Jul 2017 20:29:34 +0000 (16:29 -0400)] 
Merge branch 'multi-priority_squashed' into maint-0.3.1

8 years agoFix the cpuworker.c documentation to mention all the kinds of work
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

8 years agoNote that threadpool_queue_work...() can't actually return NULL
Nick Mathewson [Thu, 27 Jul 2017 20:11:58 +0000 (16:11 -0400)] 
Note that threadpool_queue_work...() can't actually return NULL

8 years agoAlways start with one additional worker thread
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.

8 years agoQueue consensus diffs at LOW priority.
Nick Mathewson [Wed, 12 Jul 2017 16:17:51 +0000 (12:17 -0400)] 
Queue consensus diffs at LOW priority.

Fixes bug 22883.

8 years agoFix a pair of stale comments in workqueue.c
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.

8 years agoMake the chance for priority inversion thread-specific
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.

8 years agoAdd support for multi-priority workqueues
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.

8 years agoMerge branch 'bug22895_027'
Nick Mathewson [Thu, 27 Jul 2017 15:27:07 +0000 (11:27 -0400)] 
Merge branch 'bug22895_027'

8 years agoRemove unused variables in donna's SSE2 code
cypherpunks [Wed, 12 Jul 2017 16:33:01 +0000 (16:33 +0000)] 
Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 27 Jul 2017 12:23:37 +0000 (08:23 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 27 Jul 2017 12:23:37 +0000 (08:23 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 27 Jul 2017 12:23:36 +0000 (08:23 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug20247_029' into maint-0.2.9
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

8 years agoMerge 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.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 19:39:56 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge 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.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:39:55 +0000 (15:39 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge 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.5' into maint-0.2.6

8 years agoMerge 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.7-redux' into maint-0.2.8

8 years agoMerge 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.4' into maint-0.2.5

8 years agoPoint travis to #tor-ci, not #tor-bots
Nick Mathewson [Wed, 26 Jul 2017 19:39:50 +0000 (15:39 -0400)] 
Point travis to #tor-ci, not #tor-bots

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 26 Jul 2017 19:38:48 +0000 (15:38 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1
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

8 years agoMerge branch 'maint-0.3.0' 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.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 19:37:06 +0000 (15:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoTravis update: "gcc-warnings" became "fatal-warnings" in 0.2.9
Nick Mathewson [Wed, 26 Jul 2017 19:37:00 +0000 (15:37 -0400)] 
Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9

8 years agoMerge branch 'maint-0.2.8' into maint-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

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
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

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
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

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 26 Jul 2017 19:34:56 +0000 (15:34 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 26 Jul 2017 19:34:40 +0000 (15:34 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 26 Jul 2017 16:58:22 +0000 (12:58 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge 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.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 26 Jul 2017 16:58:22 +0000 (12:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'bug23030_029_v2' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 16:58:17 +0000 (12:58 -0400)] 
Merge branch 'bug23030_029_v2' into maint-0.2.9

8 years agoFix build warnings from Coverity related to our BUG macro
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.

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 26 Jul 2017 16:54:41 +0000 (12:54 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22927_031' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 16:54:37 +0000 (12:54 -0400)] 
Merge branch 'bug22927_031' into maint-0.3.1

8 years agoMerge 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.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Wed, 26 Jul 2017 16:53:38 +0000 (12:53 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 26 Jul 2017 16:53:38 +0000 (12:53 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'bug22915_029_2' into maint-0.2.9
Nick Mathewson [Wed, 26 Jul 2017 16:53:13 +0000 (12:53 -0400)] 
Merge branch 'bug22915_029_2' into maint-0.2.9

8 years agoSuppress clang4-specific -Wdouble-promotion warnings
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.

8 years agoThis caused my attempt to fix hs_config/valid_service_v2 to fail
Nick Mathewson [Tue, 25 Jul 2017 17:24:41 +0000 (13:24 -0400)] 
This caused my attempt to fix hs_config/valid_service_v2 to fail
_again_.

Third time's the charm?

8 years agofix wordo in comment
Roger Dingledine [Tue, 25 Jul 2017 15:14:39 +0000 (11:14 -0400)] 
fix wordo in comment

8 years agoIn < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.
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.

8 years agoBuilds on CI should use --enable-fragile-hardening.
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)

8 years agoOnly install Rust in CI if RUST_OPTIONS is set.
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)

8 years agoInstall optional dependencies during Travis CI builds.
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)

8 years agoFix CI homebrew checks for outdated packages.
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)

8 years agoBuilds on CI should use --enable-fragile-hardening.
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)

8 years agoInstall optional dependencies during Travis CI builds.
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)

8 years agoFix CI homebrew checks for outdated packages.
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)

8 years agoFix remaining cases of hs_config failures without af_unix
Nick Mathewson [Mon, 24 Jul 2017 19:58:11 +0000 (15:58 -0400)] 
Fix remaining cases of hs_config failures without af_unix

8 years agoFix hs_config unit test on systems without unix sockets
Nick Mathewson [Mon, 24 Jul 2017 19:13:23 +0000 (15:13 -0400)] 
Fix hs_config unit test on systems without unix sockets

Bugfix on 418059dd96f5f427eceffff1daeb2a2f6c4adbeb; jenkins found
this.

8 years agoRename the hybrid_encrypt/decrypt functions; label them as dangerous
Nick Mathewson [Mon, 24 Jul 2017 18:32:59 +0000 (14:32 -0400)] 
Rename the hybrid_encrypt/decrypt functions; label them as dangerous

We need to keep these around for TAP and old-style hidden services,
but they're obsolete, and we shouldn't encourage anyone to use them.
So I've added "obsolete" to their names, and a comment explaining
what the problem is.

Closes ticket 23026.

8 years agoImprove comment about why we disable TLS compression.
Nick Mathewson [Mon, 24 Jul 2017 18:15:40 +0000 (14:15 -0400)] 
Improve comment about why we disable TLS compression.

Closes bug 22964.  Based on Teor's replacement there, but tries
to put the comment in a more logical place, and explain why we're
actually disabling compression in the first place.

8 years agotest: Remove buggy unit test in test_hs_service
David Goulet [Mon, 24 Jul 2017 15:31:54 +0000 (11:31 -0400)] 
test: Remove buggy unit test in test_hs_service

There isn't much of a point of this buggy test afterall to add twice the same
service object but with a different key which ultinately can end up failing
the test because 1/N_BUCKETS of probability that we end up to put the service
in the same bucket.

Fixes #23023

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agofix whitespace issue
Roger Dingledine [Sun, 23 Jul 2017 04:57:10 +0000 (00:57 -0400)] 
fix whitespace issue

8 years agoAdd a changes file for bug22636.
Isis Lovecruft [Wed, 12 Jul 2017 00:32:38 +0000 (00:32 +0000)] 
Add a changes file for bug22636.

8 years agoFix and expand upon our Travis CI configuration.
Isis Lovecruft [Tue, 11 Jul 2017 20:12:15 +0000 (20:12 +0000)] 
Fix and expand upon our Travis CI configuration.

 * CHANGE .travis.yml so that commands for different purposes (e.g. getting
   dependencies, building, testing) are in separate config lines and sections.
 * CHANGE .travis.yml to use their mechanism for installing dependencies via
   apt. [0]  This also allows us to not need sudo (the "sudo: false" line).
 * CHANGE Travis CI tests (the "script:" section) to build and run tests in the
   same manner as Jenkins (i.e. with --enable-fatal-warnings and
   --disable-silent-rules and run `make check`).
 * ADD Travis configuration to do all the target builds with both GCC and clang.
 * ADD make flags to build with both of the cores available.
 * ADD notifications for IRC, and configure email notifications (to the author
   of the commit) only if the branch was previously building successfully and
   the latest commit broke it.
 * ADD the ability to run the Travis build matrix for OSX as well, but leave it
   commented out by default (because it takes roughly ten times longer, due to a
   shortage of OSX build machines).
 * ADD Travis config option to cancel/fail the build early if one target has
   already failed ("fast_finish: true").
 * ADD comments to describe what our Travis config is doing and why it is
   configured that way.

[0]: https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-on-Container-Based-Infrastructure)

8 years agoAdd a changes file for bug22636.
Isis Lovecruft [Wed, 12 Jul 2017 00:32:38 +0000 (00:32 +0000)] 
Add a changes file for bug22636.

8 years agoFix and expand upon our Travis CI configuration.
Isis Lovecruft [Mon, 17 Jul 2017 21:43:05 +0000 (21:43 +0000)] 
Fix and expand upon our Travis CI configuration.

 * CHANGE .travis.yml so that commands for different purposes (e.g. getting
   dependencies, building, testing) are in separate config lines and sections.
 * CHANGE .travis.yml to use their mechanism for installing dependencies via
   apt. [0]  This also allows us to not need sudo (the "sudo: false" line).
 * CHANGE Travis CI tests (the "script:" section) to build and run tests in the
   same manner as Jenkins (i.e. with --enable-fatal-warnings and
   --disable-silent-rules and run `make check`).
 * CHANGE Travis config to install nightly rustc and cargo.
 * CHANGE Travis config to split rust install into commands for getting
   dependencies ("before_install:") and commands for installing them
   ("install:").
 * REMOVE shell redirection when downloading the rustup.sh script.
 * CHANGE cargo to be in "online mode" so that we can get our Rust dependencies.
   There's not really a way to get the dependencies without using cargo
   right now.  See https://bugs.torproject.org/22830 for more info.
 * REMOVE cargo "offline mode" envvars from rustup.sh invocation.
 * ADD commands to get more info about rustc and cargo before building.
 * FIX sourcing the cargo/toolchain environment that rustup creates. (Without
   this, our build scripts don't know about anything called "rustc" or "cargo".)
 * ADD Travis configuration to do all the target builds with both GCC and clang.
 * ADD make flags to build with both of the cores available.
 * ADD notifications for IRC, and configure email notifications (to the author
   of the commit) only if the branch was previously building successfully and
   the latest commit broke it.
 * ADD the ability to run the Travis build matrix for OSX as well, but leave it
   commented out by default (because it takes roughly ten times longer, due to a
   shortage of OSX build machines).
 * ADD Travis config option to cancel/fail the build early if one target has
   already failed ("fast_finish: true").
 * ADD comments to describe what our Travis config is doing and why it is
   configured that way.

[0]: https://docs.travis-ci.com/user/installing-dependencies/#Installing-Packages-on-Container-Based-Infrastructure)

8 years ago.travis.yml to run test suite
Patrick O'Doherty [Sun, 2 Jul 2017 21:28:52 +0000 (14:28 -0700)] 
.travis.yml to run test suite

Installs dependencies (including rust) and runs the existing test suite.

TODO: Introduce build matrix utilizing the rust toolchain to run test
suites both with and without the rust components.

8 years agoFix zstd 1.3.0 trouble: Be more respectful of its state machine
Nick Mathewson [Fri, 14 Jul 2017 20:21:51 +0000 (16:21 -0400)] 
Fix zstd 1.3.0 trouble: Be more respectful of its state machine

In zstd 1.3.0, once you have called ZSTD_endStream and been told
that your putput buffer is full, it really doesn't want you to call
ZSTD_compressStream again.  ZSTD 1.2.0 didn't seem to mind about
this.

This patch fixes the issue by making sure never to call
ZSTD_endStream if there's any more data on the input buffer to
process, by flushing even when we're about to call "endStream", and
by never calling "compress" or "flush" after "endStream".

8 years agoMerge branch 'bug17750_029_squashed'
Nick Mathewson [Fri, 14 Jul 2017 19:07:09 +0000 (15:07 -0400)] 
Merge branch 'bug17750_029_squashed'

8 years agoFix a signed integer overflow in dir/download_status_random_backoff
Nick Mathewson [Fri, 14 Jul 2017 17:56:40 +0000 (13:56 -0400)] 
Fix a signed integer overflow in dir/download_status_random_backoff

Fix for 22924. Bugfix on 0.2.9.1-alpha when the test was introducd
-- though it couldn't actually overflow until we fixed 17750.

Additionally, this only seems to overflow on 32-bit, and only when
the compiler doesn't re-order the (possibly dead) assignment out of
the way.  We ran into it on a 32-bit ubuntu trusty builder.

8 years agoFix 32-bit warnings in hs_common.c
Nick Mathewson [Fri, 14 Jul 2017 15:33:12 +0000 (11:33 -0400)] 
Fix 32-bit warnings in hs_common.c

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 14 Jul 2017 13:11:14 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 14 Jul 2017 13:11:14 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Fri, 14 Jul 2017 13:11:14 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22916_027' into maint-0.2.9
Nick Mathewson [Fri, 14 Jul 2017 13:11:08 +0000 (09:11 -0400)] 
Merge branch 'bug22916_027' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 14 Jul 2017 13:06:44 +0000 (09:06 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Fri, 14 Jul 2017 13:06:44 +0000 (09:06 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22803_030' into maint-0.3.0
Nick Mathewson [Fri, 14 Jul 2017 13:06:33 +0000 (09:06 -0400)] 
Merge branch 'bug22803_030' into maint-0.3.0

8 years ago.travis.yml to run test suite
Patrick O'Doherty [Sun, 2 Jul 2017 21:28:52 +0000 (14:28 -0700)] 
.travis.yml to run test suite

Installs dependencies (including rust) and runs the existing test suite.

TODO: Introduce build matrix utilizing the rust toolchain to run test
suites both with and without the rust components.

8 years agoFix compiler warnings with openssl-scrypt/libscrypt test on clang
Nick Mathewson [Thu, 13 Jul 2017 21:49:48 +0000 (17:49 -0400)] 
Fix compiler warnings with openssl-scrypt/libscrypt test on clang

Clang didn't like that we were passing uint64_t values to an API
that wanted uint32_t.  GCC has either not cared, or has figured out
that the values in question were safe to cast to uint32_t.

Fixes bug22916; bugfix on 0.2.7.2-alpha.

8 years agoMerge remote-tracking branch 'dgoulet/ticket21979_032_04'
Nick Mathewson [Thu, 13 Jul 2017 21:23:37 +0000 (17:23 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket21979_032_04'

8 years agoprop224: Fix clang warnings
David Goulet [Thu, 13 Jul 2017 21:18:11 +0000 (17:18 -0400)] 
prop224: Fix clang warnings

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoMerge remote-tracking branch 'isis/bug19476'
Nick Mathewson [Thu, 13 Jul 2017 20:58:45 +0000 (16:58 -0400)] 
Merge remote-tracking branch 'isis/bug19476'

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 13 Jul 2017 20:55:06 +0000 (16:55 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'fewer-diffs' into maint-0.3.1
Nick Mathewson [Thu, 13 Jul 2017 20:55:02 +0000 (16:55 -0400)] 
Merge branch 'fewer-diffs' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 13 Jul 2017 20:52:20 +0000 (16:52 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge branch 'bug22520_031' into maint-0.3.1
Nick Mathewson [Thu, 13 Jul 2017 20:52:16 +0000 (16:52 -0400)] 
Merge branch 'bug22520_031' into maint-0.3.1

8 years agoMerge branch 'maint-0.3.1'
Nick Mathewson [Thu, 13 Jul 2017 20:51:18 +0000 (16:51 -0400)] 
Merge branch 'maint-0.3.1'

8 years agoMerge remote-tracking branch 'isis/bug22830_0.3.1' into maint-0.3.1
Nick Mathewson [Thu, 13 Jul 2017 20:51:09 +0000 (16:51 -0400)] 
Merge remote-tracking branch 'isis/bug22830_0.3.1' into maint-0.3.1

8 years agoprop224: Move service version into config object
David Goulet [Thu, 13 Jul 2017 12:51:14 +0000 (08:51 -0400)] 
prop224: Move service version into config object

It makes more sense to have the version in the configuration object of the
service because it is afterall a torrc option (HiddenServiceVersion).

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoprop224: Use the service config object when configuring
David Goulet [Wed, 12 Jul 2017 17:52:19 +0000 (13:52 -0400)] 
prop224: Use the service config object when configuring

Both configuration function now takes the service config object instead of the
service itself.

Signed-off-by: David Goulet <dgoulet@torproject.org>
8 years agoprop224: Don't use char * for binary data
David Goulet [Wed, 12 Jul 2017 17:41:33 +0000 (13:41 -0400)] 
prop224: Don't use char * for binary data

It turns out that some char * sneaked in our hs_common.c code. Replace those
by uint8_t *.

Signed-off-by: David Goulet <dgoulet@torproject.org>