torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,676 Commits 53 Branches 631 Tags
40887b4d2ec2e1865df8f381aa1387ba4ee10eba
Commit Graph
25676 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
cypherpunks 89c0a00a9a Remove unused variables in donna's SSE2 code 
Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
 2017-07-27 11:26:13 -04:00
Nick Mathewson ced2dd5f92 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-07-27 08:23:37 -04:00
Nick Mathewson b387dd364f Merge branch 'maint-0.3.1' 2017-07-27 08:23:37 -04:00
Nick Mathewson ad35e595e5 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-07-27 08:23:36 -04:00
Nick Mathewson 24ddf5862e Merge remote-tracking branch 'public/bug20247_029' into maint-0.2.9 2017-07-27 08:23:34 -04:00
Nick Mathewson 1c5a76f0ce Merge branch 'maint-0.3.0' into maint-0.3.1 2017-07-26 15:39:56 -04:00
Nick Mathewson 836d628fc5 Merge branch 'maint-0.3.1' 2017-07-26 15:39:56 -04:00
Nick Mathewson 7021d33b91 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-07-26 15:39:56 -04:00
Nick Mathewson 5c5eb0f095 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-07-26 15:39:55 -04:00
Nick Mathewson ddd66cc019 Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-07-26 15:39:55 -04:00
Nick Mathewson f794b40ec0 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-07-26 15:39:55 -04:00
Nick Mathewson af39c13a03 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-07-26 15:39:55 -04:00
Nick Mathewson f17f7a4fdf Merge branch 'maint-0.2.8' into maint-0.2.9 2017-07-26 15:39:55 -04:00
Nick Mathewson ebb441ded2 Point travis to #tor-ci, not #tor-bots 2017-07-26 15:39:50 -04:00
Nick Mathewson ca9834c5ca Merge branch 'maint-0.3.1' 2017-07-26 15:38:48 -04:00
Nick Mathewson ebb0ac3385 Merge remote-tracking branch 'isis/bug22636_0.3.1_squashed' into maint-0.3.1 2017-07-26 15:38:23 -04:00
Nick Mathewson 1a907c6593 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.
 2017-07-26 15:37:53 -04:00
Nick Mathewson cc4c1840a6 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-07-26 15:37:06 -04:00
Nick Mathewson f226d6460d Travis update: "gcc-warnings" became "fatal-warnings" in 0.2.9 2017-07-26 15:37:00 -04:00
Nick Mathewson dcc477cb53 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-07-26 15:35:17 -04:00
Nick Mathewson fbf93614c9 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-07-26 15:35:07 -04:00
Nick Mathewson c362c6a852 Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-07-26 15:35:01 -04:00
Nick Mathewson 0ad5a6b034 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-07-26 15:34:56 -04:00
Nick Mathewson 09618bc488 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-07-26 15:34:40 -04:00
Nick Mathewson 8d3c3f039d Merge branch 'maint-0.3.1' 2017-07-26 12:58:22 -04:00
Nick Mathewson 431c8d09ee Merge branch 'maint-0.3.0' into maint-0.3.1 2017-07-26 12:58:22 -04:00
Nick Mathewson 18734d3b25 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-07-26 12:58:22 -04:00
Nick Mathewson 0117e2ea0d Merge branch 'bug23030_029_v2' into maint-0.2.9 2017-07-26 12:58:17 -04:00
Nick Mathewson 32b9edeb91 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.
 2017-07-26 12:57:49 -04:00
Nick Mathewson 8b5b3b5fb4 Merge branch 'maint-0.3.1' 2017-07-26 12:54:41 -04:00
Nick Mathewson 30a98c765f Merge branch 'bug22927_031' into maint-0.3.1 2017-07-26 12:54:37 -04:00
Nick Mathewson 3c017e823b Merge branch 'maint-0.2.9' into maint-0.3.0 2017-07-26 12:53:38 -04:00
Nick Mathewson 5141360099 Merge branch 'maint-0.3.1' 2017-07-26 12:53:38 -04:00
Nick Mathewson d068f3359f Merge branch 'maint-0.3.0' into maint-0.3.1 2017-07-26 12:53:38 -04:00
Nick Mathewson 6d3c5b8fb5 Merge branch 'bug22915_029_2' into maint-0.2.9 2017-07-26 12:53:13 -04:00
Nick Mathewson fca1934c88 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.
 2017-07-26 12:53:00 -04:00
Nick Mathewson b9ad49844b This caused my attempt to fix hs_config/valid_service_v2 to fail 
_again_.

Third time's the charm?
 2017-07-25 13:24:41 -04:00
David Goulet c9927ce4d5 prop224: Add onion key to service descriptor intro point 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-07-25 13:11:40 -04:00
David Goulet 78e2bc4000 prop224: Add the introduction point onion key to descriptor 
A prop224 descriptor was missing the onion key for an introduction point which
is needed to extend to it by the client.

Closes #22979

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-07-25 13:11:40 -04:00
David Goulet b8ceab9bb3 prop224: Helper to dup a link_specifier_t object 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-07-25 13:11:40 -04:00
David Goulet 2b9575a9c0 prop224: Update hs identifier circuit 
Remove the legacy intro point key because both service and client only uses
the ed25519 key even though the intro point chosen is a legacy one.

This also adds the CLIENT_PK key that is needed for the ntor handshake.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-07-25 13:11:40 -04:00
David Goulet 3e537c6fe4 trunnel: Add prop224 RENDEZVOUS1 cell definition 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-07-25 13:11:40 -04:00
Roger Dingledine bb66a48541 fix wordo in comment 2017-07-25 11:14:39 -04:00
Isis Lovecruft 6d0af8dacc In < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings. 2017-07-25 01:03:15 +00:00
Isis Lovecruft 810bbb7911 Builds on CI should use --enable-fragile-hardening. 
(cherry picked from commit c91a57ccf90308c6728184b43519f96b61acb95d)
 2017-07-25 00:58:00 +00:00
Isis Lovecruft 1d42316f49 Only install Rust in CI if RUST_OPTIONS is set. 
(cherry picked from commit e5dd07a4c64fd2a4132ab1f6dec64640a95da35e)
 2017-07-25 00:57:55 +00:00
Isis Lovecruft c84d394176 Install optional dependencies during Travis CI builds. 
(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04)
 2017-07-25 00:57:41 +00:00
Isis Lovecruft f18205f2e1 Fix CI homebrew checks for outdated packages. 
(cherry picked from commit 8f8689f70235dc19cbc5092ea148af5772a9cdc3)
 2017-07-25 00:57:32 +00:00
Isis Lovecruft c718644251 Builds on CI should use --enable-fragile-hardening. 
(cherry picked from commit c91a57ccf90308c6728184b43519f96b61acb95d)
 2017-07-25 00:54:11 +00:00
Isis Lovecruft f2e3d13930 Install optional dependencies during Travis CI builds. 
(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04)
 2017-07-25 00:54:01 +00:00