]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMerge branch 'bug26470_032' into maint-0.3.3
Nick Mathewson [Fri, 2 Nov 2018 13:06:32 +0000 (09:06 -0400)] 
Merge branch 'bug26470_032' into maint-0.3.3

7 years agoMerge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
Nick Mathewson [Fri, 2 Nov 2018 13:04:20 +0000 (09:04 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 31 Oct 2018 15:01:40 +0000 (11:01 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
Nick Mathewson [Wed, 31 Oct 2018 15:01:36 +0000 (11:01 -0400)] 
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9

7 years agoMerge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
Nick Mathewson [Tue, 30 Oct 2018 13:33:36 +0000 (09:33 -0400)] 
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3

7 years agoMerge branch 'bug28202_029' into bug28202_033
Nick Mathewson [Thu, 25 Oct 2018 13:14:06 +0000 (09:14 -0400)] 
Merge branch 'bug28202_029' into bug28202_033

7 years agoFix two other cases of (buf + N > end) pattern
Nick Mathewson [Thu, 25 Oct 2018 13:08:02 +0000 (09:08 -0400)] 
Fix two other cases of (buf + N > end) pattern

Related to fix for 28202.

7 years agoFix possible UB in an end-of-string check in get_next_token().
Nick Mathewson [Thu, 25 Oct 2018 13:06:13 +0000 (09:06 -0400)] 
Fix possible UB in an end-of-string check in get_next_token().

Remember, you can't check to see if there are N bytes left in a
buffer by doing (buf + N < end), since the buf + N computation might
take you off the end of the buffer and result in undefined behavior.

Fixes 28202; bugfix on 0.2.0.3-alpha.

7 years agoRemove a now-unused rust "use".
Nick Mathewson [Tue, 23 Oct 2018 23:50:45 +0000 (19:50 -0400)] 
Remove a now-unused rust "use".

7 years agoMerge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3
Nick Mathewson [Tue, 23 Oct 2018 23:17:48 +0000 (19:17 -0400)] 
Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3

7 years agoTreat backtrace test failures as expected on most BSD-derived systems
teor [Tue, 23 Oct 2018 01:21:10 +0000 (11:21 +1000)] 
Treat backtrace test failures as expected on most BSD-derived systems

Treat backtrace test failures as expected on NetBSD, OpenBSD, and
macOS/Darwin, until we solve bug 17808.

(FreeBSD failures have been treated as expected since 18204 in 0.2.8.)

Fixes bug 27948; bugfix on 0.2.5.2-alpha.

7 years agoLog more info for duplicate ed25519 IDs
Taylor Yu [Wed, 17 Oct 2018 20:39:55 +0000 (15:39 -0500)] 
Log more info for duplicate ed25519 IDs

Occasionally, key pinning doesn't catch a relay that shares an ed25519
ID with another relay.  Log the identity fingerprints and the shared
ed25519 ID when this happens, instead of making a BUG() warning.

Fixes bug 27800; bugfix on 0.3.2.1-alpha.

7 years agoFix another tor_assert(0) case
Nick Mathewson [Mon, 15 Oct 2018 16:52:48 +0000 (12:52 -0400)] 
Fix another tor_assert(0) case

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Mon, 15 Oct 2018 16:47:46 +0000 (12:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoFix make check-spaces.
Nick Mathewson [Mon, 15 Oct 2018 16:47:19 +0000 (12:47 -0400)] 
Fix make check-spaces.

7 years agoAdjust tor_assert_unreached()
Nick Mathewson [Mon, 15 Oct 2018 14:46:24 +0000 (10:46 -0400)] 
Adjust tor_assert_unreached()

This version of the macro makes it obvious to the compiler that
"tor_assert_unreached()" will always abort().

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Mon, 15 Oct 2018 14:37:49 +0000 (10:37 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge branch 'bug27709_029' into maint-0.2.9
Nick Mathewson [Mon, 15 Oct 2018 14:34:39 +0000 (10:34 -0400)] 
Merge branch 'bug27709_029' into maint-0.2.9

7 years agoExplain a bit more about branch prediction in the unit-test case
Nick Mathewson [Mon, 15 Oct 2018 14:16:34 +0000 (10:16 -0400)] 
Explain a bit more about branch prediction in the unit-test case

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 10 Oct 2018 21:12:34 +0000 (17:12 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoMerge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
Nick Mathewson [Wed, 10 Oct 2018 21:12:11 +0000 (17:12 -0400)] 
Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9

7 years agoMerge remote-tracking branch 'teor/bug27738-032' into bug27738-033
Taylor Yu [Wed, 10 Oct 2018 20:01:59 +0000 (15:01 -0500)] 
Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
Nick Mathewson [Wed, 10 Oct 2018 15:34:48 +0000 (11:34 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

7 years agoUpdate geoip and geoip6 to the October 9 2018 database.
Karsten Loesing [Wed, 10 Oct 2018 15:26:41 +0000 (17:26 +0200)] 
Update geoip and geoip6 to the October 9 2018 database.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 21 Sep 2018 13:35:51 +0000 (09:35 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2 maint-0.3.2
Nick Mathewson [Fri, 21 Sep 2018 13:35:23 +0000 (09:35 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agorust/protover: return C-allocated string in protover_all_supported()
cypherpunks [Fri, 21 Sep 2018 05:16:22 +0000 (05:16 +0000)] 
rust/protover: return C-allocated string in protover_all_supported()

The result of CString::into_raw() is not safe to free
with free() except under finicky and fragile circumstances
that we definitely don't meet right now.

This was missed in be583a34a3815c2c10e86094ab0610e4b7f9c869.

7 years agorust/protover: fix null deref in protover_all_supported()
cypherpunks [Fri, 21 Sep 2018 04:57:26 +0000 (04:57 +0000)] 
rust/protover: fix null deref in protover_all_supported()

Fortunately with the current callers it couldn't happen in practice.

Fix on d1820c1516a31a149fc51a9e5126bf899e4c4e08.

7 years agohs-v3: Close all SOCKS request on descriptor failure
David Goulet [Wed, 19 Sep 2018 14:56:15 +0000 (10:56 -0400)] 
hs-v3: Close all SOCKS request on descriptor failure

Client side, when a descriptor is finally fetched and stored in the cache, we
then go over all pending SOCKS request for that descriptor. If it turns out
that the intro points are unusable, we close the first SOCKS request but not
the others for the same .onion.

This commit makes it that we'll close all SOCKS requests so we don't let
hanging the other ones.

It also fixes another bug which is having a SOCKS connection in RENDDESC_WAIT
state but with a descriptor in the cache. At some point, tor will expire the
intro failure cache which will make that descriptor usable again. When
retrying all SOCKS connection (retry_all_socks_conn_waiting_for_desc()), we
won't end up in the code path where we have already the descriptor for a
pending request causing a BUG().

Bottom line is that we should never have pending requests (waiting for a
descriptor) with that descriptor in the cache (even if unusable).

Fixees #27410.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2
David Goulet [Thu, 20 Sep 2018 14:59:23 +0000 (10:59 -0400)] 
Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

7 years agoMerge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3
Nick Mathewson [Tue, 18 Sep 2018 12:31:08 +0000 (08:31 -0400)] 
Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3

7 years agoTravis: use the Homebrew addon for xz and zstd
teor [Tue, 18 Sep 2018 09:36:28 +0000 (19:36 +1000)] 
Travis: use the Homebrew addon for xz and zstd

xz and zstd were added as optional dependencies in 0.3.1.1-alpha.

Implements ticket 27738.

7 years agoMerge branch 'bug27738-029' into bug27738-032
teor [Tue, 18 Sep 2018 09:34:53 +0000 (19:34 +1000)] 
Merge branch 'bug27738-029' into bug27738-032

Resolve conflicts due to modified comments, and deleted lines.

7 years agoTravis: use the Homebrew addon
teor [Tue, 18 Sep 2018 09:26:54 +0000 (19:26 +1000)] 
Travis: use the Homebrew addon

Use the Travis Homebrew addon to install packages on macOS. The package
list is the same, but the Homebrew addon does not do a `brew update` by
default.

This makes builds faster, at the cost of using slightly older packages.

Implements ticket 27738.

7 years agoRemove extraneous argument from Rust protover_compute_vote()
Nick Mathewson [Mon, 17 Sep 2018 15:50:46 +0000 (11:50 -0400)] 
Remove extraneous argument from Rust protover_compute_vote()

This argument was added to match an older idea for the C api, but we
decided not to do it that way in C.

Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 14 Sep 2018 16:56:30 +0000 (12:56 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agohs-v3: Don't BUG() on directory permission check failure
David Goulet [Fri, 14 Sep 2018 14:56:34 +0000 (10:56 -0400)] 
hs-v3: Don't BUG() on directory permission check failure

In hs_config.c, we do validate the permission of the hidden service directory
but we do not try to create it. So, in the event that the directory doesn't
exists, we end up in the loading key code path which checks for the
permission and possibly creates the directory. On failure, don't BUG() since
there is a perfectly valid use case for that function to fail.

Fixes #27335

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoRevise our assertion and bug macros to work with -Wparentheses
Nick Mathewson [Fri, 14 Sep 2018 15:39:37 +0000 (11:39 -0400)] 
Revise our assertion and bug macros to work with -Wparentheses

On GCC and Clang, there's a feature to warn you about bad
conditionals like "if (a = b)", which should be "if (a == b)".
However, they don't warn you if there are extra parentheses around
"a = b".

Unfortunately, the tor_assert() macro and all of its kin have been
passing their inputs through stuff like PREDICT_UNLIKELY(expr) or
PREDICT_UNLIKELY(!(expr)), both of which expand to stuff with more
parentheses around "expr", thus suppressing these warnings.

To fix this, this patch introduces new macros that do not wrap
expr.  They're only used when GCC or Clang is enabled (both define
__GNUC__), since they require GCC's "({statement expression})"
syntax extension.  They're only used when we're building the
unit-test variant of the object files, since they suppress the
branch-prediction hints.

I've confirmed that tor_assert(), tor_assert_nonfatal(),
tor_assert_nonfatal_once(), BUG(), and IF_BUG_ONCE() all now give
compiler warnings when their argument is an assignment expression.

Fixes bug 27709.

Bugfix on 0.0.6, where we first introduced the "tor_assert()" macro.

7 years agorust/protover: delete ProtoSet::retain
cypherpunks [Wed, 15 Aug 2018 03:23:08 +0000 (03:23 +0000)] 
rust/protover: delete ProtoSet::retain

As the comment noted, it was horribly inefficient.

7 years agorust/protover: use .and_not_in() instead of .retain() in all_supported()
cypherpunks [Thu, 9 Aug 2018 21:26:10 +0000 (21:26 +0000)] 
rust/protover: use .and_not_in() instead of .retain() in all_supported()

.retain() would allocating a Vec of billions of integers and check them
one at a time to separate the supported versions from the unsupported.
This leads to a memory DoS.

Closes ticket 27206. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.

7 years agorust/protover: add ProtoSet::and_not_in()
cypherpunks [Thu, 9 Aug 2018 21:25:18 +0000 (21:25 +0000)] 
rust/protover: add ProtoSet::and_not_in()

This is a way more efficient version of retain().

7 years agoIf options_act() fails, restore the previous value of global_options
Nick Mathewson [Fri, 14 Sep 2018 14:34:45 +0000 (10:34 -0400)] 
If options_act() fails, restore the previous value of global_options

Before 0.3.3.1-alpha, we would exit() in this case immediately.  But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.

Fixes bug 27708; bugfix on 0.3.3.1-alpha.

7 years agoprotover: reject invalid protocol names
cypherpunks [Sun, 26 Aug 2018 01:20:44 +0000 (01:20 +0000)] 
protover: reject invalid protocol names

The spec only allows the characters [A-Za-z0-9-].

Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f.
Fixes #27316; bugfix on 0.2.9.4-alpha.

7 years agorust/protover: validate unknown protocol names use only allowed characters
cypherpunks [Thu, 13 Sep 2018 16:33:58 +0000 (16:33 +0000)] 
rust/protover: validate unknown protocol names use only allowed characters

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 13 Sep 2018 15:46:04 +0000 (11:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'bug27658_029' into maint-0.2.9
Nick Mathewson [Thu, 13 Sep 2018 15:45:58 +0000 (11:45 -0400)] 
Merge branch 'bug27658_029' into maint-0.2.9

7 years agofixup! changes file
cypherpunks [Wed, 12 Sep 2018 14:22:31 +0000 (14:22 +0000)] 
fixup! changes file

7 years agoCheck waitpid return value and exit status in tinytest.c
Nick Mathewson [Wed, 12 Sep 2018 12:57:18 +0000 (08:57 -0400)] 
Check waitpid return value and exit status in tinytest.c

It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.

7 years agorust/protover: fix check for overlapping ranges
cypherpunks [Wed, 12 Sep 2018 02:14:29 +0000 (02:14 +0000)] 
rust/protover: fix check for overlapping ranges

Closes ticket 27649. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.

7 years agorust/protover: remove version zero from tests
cypherpunks [Sat, 18 Aug 2018 20:05:19 +0000 (20:05 +0000)] 
rust/protover: remove version zero from tests

This isn't legal according to dir-spec.txt.

We can write separate tests for it if the spec
is changed to make it legal.

7 years agotest/protover: remove version zero from tests
cypherpunks [Sat, 18 Aug 2018 16:54:09 +0000 (16:54 +0000)] 
test/protover: remove version zero from tests

This isn't legal according to dir-spec.txt.

We can write separate tests for it if the spec
is changed to make it legal.

7 years agoBug 25505: Check circuitmux queues before padding.
Mike Perry [Tue, 13 Mar 2018 13:50:35 +0000 (13:50 +0000)] 
Bug 25505: Check circuitmux queues before padding.

7 years agoMerge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2
David Goulet [Tue, 11 Sep 2018 19:36:48 +0000 (15:36 -0400)] 
Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 11 Sep 2018 17:09:21 +0000 (13:09 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 11 Sep 2018 17:09:21 +0000 (13:09 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
Nick Mathewson [Tue, 11 Sep 2018 17:09:09 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
Nick Mathewson [Tue, 11 Sep 2018 17:09:04 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
Nick Mathewson [Tue, 11 Sep 2018 17:08:57 +0000 (13:08 -0400)] 
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 11 Sep 2018 16:04:56 +0000 (12:04 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 11 Sep 2018 16:04:55 +0000 (12:04 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoUpdate geoip and geoip6 to the September 6 2018 database.
Karsten Loesing [Tue, 11 Sep 2018 07:26:59 +0000 (09:26 +0200)] 
Update geoip and geoip6 to the September 6 2018 database.

7 years agoBump to 0.3.3.10-dev.
Nick Mathewson [Mon, 10 Sep 2018 13:42:12 +0000 (09:42 -0400)] 
Bump to 0.3.3.10-dev.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 10 Sep 2018 13:41:55 +0000 (09:41 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid version bump.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Mon, 10 Sep 2018 13:41:39 +0000 (09:41 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid version bump.

7 years agoBump to 0.3.2.12-dev
Nick Mathewson [Mon, 10 Sep 2018 13:41:34 +0000 (09:41 -0400)] 
Bump to 0.3.2.12-dev

7 years agoBump to 0.2.9.17-dev
Nick Mathewson [Mon, 10 Sep 2018 13:41:22 +0000 (09:41 -0400)] 
Bump to 0.2.9.17-dev

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 19:12:09 +0000 (15:12 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

"ours" to avoid bump

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 19:11:49 +0000 (15:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid bump

7 years agoBump to 0.3.3.10
Nick Mathewson [Fri, 7 Sep 2018 19:11:18 +0000 (15:11 -0400)] 
Bump to 0.3.3.10

7 years agoBump to 0.3.2.12
Nick Mathewson [Fri, 7 Sep 2018 19:11:07 +0000 (15:11 -0400)] 
Bump to 0.3.2.12

7 years agoBump to 0.2.9.17
Nick Mathewson [Fri, 7 Sep 2018 19:10:49 +0000 (15:10 -0400)] 
Bump to 0.2.9.17

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 13:15:56 +0000 (09:15 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 13:15:52 +0000 (09:15 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'ticket27344_029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 13:15:15 +0000 (09:15 -0400)] 
Merge branch 'ticket27344_029' into maint-0.2.9

7 years agoTell openssl to build its TLS contexts with security level 1
Nick Mathewson [Fri, 7 Sep 2018 12:57:14 +0000 (08:57 -0400)] 
Tell openssl to build its TLS contexts with security level 1

Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:45 +0000 (08:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:46:41 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:46:35 +0000 (08:46 -0400)] 
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:44:40 +0000 (08:44 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:44:39 +0000 (08:44 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
Nick Mathewson [Fri, 7 Sep 2018 12:44:36 +0000 (08:44 -0400)] 
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 7 Sep 2018 12:42:19 +0000 (08:42 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'bug27461-029' into bug27461-032
teor [Fri, 7 Sep 2018 03:00:34 +0000 (13:00 +1000)] 
Merge branch 'bug27461-029' into bug27461-032

Fix a minor merge conflict due to an #endif comment.

7 years agoWindows: Stop calling SetProcessDEPPolicy() on 64-bit Windows
teor [Fri, 7 Sep 2018 02:58:11 +0000 (12:58 +1000)] 
Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows

It is not supported, and always fails. Some compilers warn about the
function pointer cast on 64-bit Windows.

Fixes bug 27461; bugfix on 0.2.2.23-alpha.

7 years agohs: Silence a spurious warning in rend_client_send_introduction()
teor [Wed, 5 Sep 2018 11:07:58 +0000 (21:07 +1000)] 
hs: Silence a spurious warning in rend_client_send_introduction()

gcc 8 warns that extend_info_t.nickname might be truncated by strncpy().

But it doesn't know that nickname can either contain a hex id, or a
nicknames. hex ids are only used for general and HSDir circuits.

Fixes bug 27463; bugfix on 0.1.1.2-alpha.

7 years agoWindows: Silence a spurious warning in the GetAdaptersAddresses cast
teor [Thu, 6 Sep 2018 03:11:23 +0000 (13:11 +1000)] 
Windows: Silence a spurious warning in the GetAdaptersAddresses cast

GetProcAddress() returns FARPROC, which is (long long int(*)()) on
64-bit Windows:
https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).aspx

But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit
and 64-bit Windows:
https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-getadaptersaddresses

So gcc 8 issues a spurious "incompatible function pointer" warning
about the cast to GetAdaptersAddresses_fn_t.

Silence this warning by casting to a void function pointer, before
the cast to GetAdaptersAddresses_fn_t.

This issue is already fixed by 26481 in 0.3.5 and later, by removing
the lookup and cast.

Fixes bug 27465; bugfix on 0.2.3.11-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 14:15:45 +0000 (10:15 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 5 Sep 2018 14:15:42 +0000 (10:15 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
Nick Mathewson [Wed, 5 Sep 2018 14:14:56 +0000 (10:14 -0400)] 
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 5 Sep 2018 13:56:19 +0000 (09:56 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoTravis: don't call echo with a --flag as the first argument
teor [Wed, 5 Sep 2018 03:30:17 +0000 (13:30 +1000)] 
Travis: don't call echo with a --flag as the first argument

When we use echo in Travis, don't pass a --flag as the first argument.

Fixes bug 27418; bugfix on 0.3.4.7-rc.

7 years agoTravis: when showing a log fails, keep trying to show other logs
teor [Wed, 5 Sep 2018 03:12:54 +0000 (13:12 +1000)] 
Travis: when showing a log fails, keep trying to show other logs

When a Travis build fails, and showing a log fails, keep trying to
show the other logs.

Fixes bug 27453; bugfix on 0.3.4.7-rc.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 29 Aug 2018 15:17:31 +0000 (11:17 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoTest: avoid spurious failures in make test-network-all
teor [Fri, 24 Aug 2018 00:25:25 +0000 (10:25 +1000)] 
Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.

7 years agoTest: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
teor [Fri, 24 Aug 2018 00:20:30 +0000 (10:20 +1000)] 
Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.