]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoAdd .editorconfig to follow coding standards style
juga0 [Sun, 3 Jun 2018 10:44:02 +0000 (10:44 +0000)] 
Add .editorconfig to follow coding standards style

7 years agoFix a bug in my fix for #26258
Nick Mathewson [Sat, 16 Jun 2018 17:08:40 +0000 (13:08 -0400)] 
Fix a bug in my fix for #26258

The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.

7 years agoMerge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
Nick Mathewson [Thu, 14 Jun 2018 16:47:09 +0000 (12:47 -0400)] 
Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3

7 years agosquash! Make sure that the test_rust.sh script fails when a test fails
Nick Mathewson [Wed, 13 Jun 2018 16:21:25 +0000 (12:21 -0400)] 
squash! Make sure that the test_rust.sh script fails when a test fails

Also make sure that we're actually running the test from within the right
cwd, like we do when we're building.  This seems necessary to avoid
an error when running offline.

Amusingly, it appears that we had this bug before: we just weren't
noticing it, because of bug 26258.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoFix an extra space in a changes file
Nick Mathewson [Wed, 13 Jun 2018 13:59:26 +0000 (09:59 -0400)] 
Fix an extra space in a changes file

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:58:05 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:58:04 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'bug26158_031' into maint-0.3.1
Nick Mathewson [Wed, 13 Jun 2018 13:58:01 +0000 (09:58 -0400)] 
Merge branch 'bug26158_031' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:57:10 +0000 (09:57 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'bug25686_diagnostic_032' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:56:17 +0000 (09:56 -0400)] 
Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

7 years agobump to 0.3.3.7-dev
Nick Mathewson [Tue, 12 Jun 2018 16:05:09 +0000 (12:05 -0400)] 
bump to 0.3.3.7-dev

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

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

7 years agoMerge branch 'dannenberg_ipv6_029' into maint-0.2.9
Nick Mathewson [Tue, 12 Jun 2018 13:44:13 +0000 (09:44 -0400)] 
Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

7 years agoAdd a changelog entry.
Linus Nordberg [Sun, 10 Jun 2018 11:09:38 +0000 (13:09 +0200)] 
Add a changelog entry.

7 years agoAdd IPv6 orport address for dannenberg.
Linus Nordberg [Sun, 10 Jun 2018 09:07:00 +0000 (11:07 +0200)] 
Add IPv6 orport address for dannenberg.

7 years agoBump to 0.3.3.7
Nick Mathewson [Tue, 12 Jun 2018 12:57:09 +0000 (08:57 -0400)] 
Bump to 0.3.3.7

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 12 Jun 2018 12:18:56 +0000 (08:18 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 12 Jun 2018 12:18:56 +0000 (08:18 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
Nick Mathewson [Tue, 12 Jun 2018 12:18:53 +0000 (08:18 -0400)] 
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 12 Jun 2018 12:11:20 +0000 (08:11 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 12 Jun 2018 12:11:20 +0000 (08:11 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 12 Jun 2018 12:11:19 +0000 (08:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoSeveral attempts to diagnose ticket 25686
Nick Mathewson [Mon, 11 Jun 2018 20:14:57 +0000 (16:14 -0400)] 
Several attempts to diagnose ticket 25686

There are a few reasons that relays might be uploading desciptors
without saying X-Desc-Gen-Reason:
  1. They are running an old version of our software, before 0.3.2.stable.
  2. They are not running our software, but they are claiming they
     are.
  3. They are uploading through a proxy that strips X-Desc-Gen-Reason.
  4. They somehow had a bug in their software.

According to the 25686 data, 1 is the most common reason.  This
ticket is an attempt to diagnose case 4, or prove that case 4
doesn't actually happen.

7 years agoUpdate geoip and geoip6 to the June 7 2018 database.
Karsten Loesing [Mon, 11 Jun 2018 19:58:55 +0000 (21:58 +0200)] 
Update geoip and geoip6 to the June 7 2018 database.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 8 Jun 2018 14:12:57 +0000 (10:12 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoAvoid out-of-bounds smartlist access in protover_compute_vote()
rl1987 [Mon, 4 Jun 2018 09:27:10 +0000 (12:27 +0300)] 
Avoid out-of-bounds smartlist access in protover_compute_vote()
and contract_protocol_list()

7 years agoSilence unused-const-variable warnings in zstd.h on some gcc versions
teor [Sat, 2 Jun 2018 21:08:01 +0000 (14:08 -0700)] 
Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.

7 years agoMerge branch 'bug26121-033-squashed' into maint-0.3.3
Nick Mathewson [Sat, 2 Jun 2018 17:36:44 +0000 (10:36 -0700)] 
Merge branch 'bug26121-033-squashed' into maint-0.3.3

7 years agoBug 26121: Improve BUILDTIMEOUT_SET accuracy.
Mike Perry [Wed, 16 May 2018 06:42:41 +0000 (06:42 +0000)] 
Bug 26121: Improve BUILDTIMEOUT_SET accuracy.

We were miscounting the total number of circuits for the TIMEOUT_RATE and
CLOSE_RATE fields of this event.

7 years agoMake sure that the test_rust.sh script fails when a test fails
Nick Mathewson [Fri, 1 Jun 2018 00:15:57 +0000 (17:15 -0700)] 
Make sure that the test_rust.sh script fails when a test fails

Exit codes from find(1) seem not to be so reliable as we had hoped.

Closes ticket 26258; bugfix on 0.3.3.4-alpha when we fixed #25560

7 years agoMerge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
Nick Mathewson [Sun, 27 May 2018 14:03:11 +0000 (10:03 -0400)] 
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 24 May 2018 13:40:06 +0000 (09:40 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 24 May 2018 13:40:06 +0000 (09:40 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 24 May 2018 13:40:06 +0000 (09:40 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'bug26116_033' into maint-0.3.3
Nick Mathewson [Thu, 24 May 2018 13:40:00 +0000 (09:40 -0400)] 
Merge branch 'bug26116_033' into maint-0.3.3

7 years agoMerge branch 'bug26116_029' into maint-0.2.9
Nick Mathewson [Thu, 24 May 2018 13:39:46 +0000 (09:39 -0400)] 
Merge branch 'bug26116_029' into maint-0.2.9

7 years agoAdd a unit test for PEM-encrypted documents.
Nick Mathewson [Thu, 24 May 2018 13:36:33 +0000 (09:36 -0400)] 
Add a unit test for PEM-encrypted documents.

7 years agoUpdate version to 0.3.3.6-dev
Nick Mathewson [Tue, 22 May 2018 22:05:28 +0000 (18:05 -0400)] 
Update version to 0.3.3.6-dev

7 years agoMerge branch 'trove-2018-005_032' into maint-0.3.3
Nick Mathewson [Tue, 22 May 2018 18:13:23 +0000 (14:13 -0400)] 
Merge branch 'trove-2018-005_032' into maint-0.3.3

7 years agoavoid a signed/unsigned comparison.
Nick Mathewson [Tue, 22 May 2018 18:12:44 +0000 (14:12 -0400)] 
avoid a signed/unsigned comparison.

7 years agoMake the TROVE-2018-005 fix work with rust.
Nick Mathewson [Tue, 22 May 2018 17:35:20 +0000 (13:35 -0400)] 
Make the TROVE-2018-005 fix work with rust.

7 years agoMerge branch 'trove-2018-005_032' into maint-0.3.3
Nick Mathewson [Tue, 22 May 2018 16:54:26 +0000 (12:54 -0400)] 
Merge branch 'trove-2018-005_032' into maint-0.3.3

7 years agouint breaks compilation on windows
Nick Mathewson [Tue, 22 May 2018 16:54:05 +0000 (12:54 -0400)] 
uint breaks compilation on windows

7 years agoversion bump to 0.3.3.6
Nick Mathewson [Tue, 22 May 2018 16:40:18 +0000 (12:40 -0400)] 
version bump to 0.3.3.6

7 years agorust: Mirror TROVE-2018-005 fix in Rust protover implementation.
Isis Lovecruft [Wed, 21 Mar 2018 02:22:54 +0000 (02:22 +0000)] 
rust: Mirror TROVE-2018-005 fix in Rust protover implementation.

 * REFACTORS `UnvalidatedProtoEntry::from_str` to place the bulk of the
   splitting/parsing logic in to a new
   `UnvalidatedProtoEntry::parse_protocol_and_version_str()` method (so that
   both `from_str()` and `from_str_any_len()` can call it.)
 * ADD a new `UnvalidatedProtoEntry::from_str_any_len()` method in order to
   maintain compatibility with consensus methods older than 29.
 * ADD a limit on the number of characters in a protocol name.
 * FIXES part of #25517: https://bugs.torproject.org/25517

7 years agoMerge branch 'trove-2018-005_032' into trove-2018-005_033
Nick Mathewson [Tue, 22 May 2018 16:27:15 +0000 (12:27 -0400)] 
Merge branch 'trove-2018-005_032' into trove-2018-005_033

7 years agochanges file for TROVE-2018-005
Nick Mathewson [Tue, 22 May 2018 16:21:00 +0000 (12:21 -0400)] 
changes file for TROVE-2018-005

7 years agoAdd stdbool to protover.h. Only needed for the 032 backport
Nick Mathewson [Tue, 22 May 2018 16:15:52 +0000 (12:15 -0400)] 
Add stdbool to protover.h. Only needed for the 032 backport

7 years agovote: TROVE-2018-005 Make DirAuths omit misbehaving routers from their vote.
Isis Lovecruft [Mon, 7 May 2018 23:59:06 +0000 (23:59 +0000)] 
vote: TROVE-2018-005 Make DirAuths omit misbehaving routers from their vote.

7 years agoprotover: TROVE-2018-005 Fix potential DoS in protover protocol parsing.
Isis Lovecruft [Thu, 29 Mar 2018 01:54:05 +0000 (01:54 +0000)] 
protover: TROVE-2018-005 Fix potential DoS in protover protocol parsing.

In protover.c, the `expand_protocol_list()` function expands a `smartlist_t` of
`proto_entry_t`s to their protocol name concatenated with each version number.
For example, given a `proto_entry_t` like so:

    proto_entry_t *proto = tor_malloc(sizeof(proto_entry_t));
    proto_range_t *range = tor_malloc_zero(sizeof(proto_range_t));

    proto->name = tor_strdup("DoSaaaaaaaaaaaaaaaaaaaaaa[19KB]aaa");
    proto->ranges = smartlist_new();

    range->low = 1;
    range->high = 65536;

    smartlist_add(proto->ranges, range);

(Where `[19KB]` is roughly 19KB of `"a"` bytes.)  This would expand in
`expand_protocol_list()` to a `smartlist_t` containing 65536 copies of the
string, e.g.:

    "DoSaaaaaaaaaaaaaaaaaaaaaa[19KB]aaa=1"
    "DoSaaaaaaaaaaaaaaaaaaaaaa[19KB]aaa=2"
    […]
    "DoSaaaaaaaaaaaaaaaaaaaaaa[19KB]aaa=65535"

Thus constituting a potential resource exhaustion attack.

The Rust implementation is not subject to this attack, because it instead
expands the above string into a `HashMap<String, HashSet<u32>` prior to #24031,
and a `HashMap<UnvalidatedProtocol, ProtoSet>` after).  Neither Rust version is
subject to this attack, because it only stores the `String` once per protocol.
(Although a related, but apparently of too minor impact to be usable, DoS bug
has been fixed in #24031. [0])

[0]: https://bugs.torproject.org/24031

 * ADDS hard limit on protocol name lengths in protover.c and checks in
   parse_single_entry() and expand_protocol_list().
 * ADDS tests to ensure the bug is caught.
 * FIXES #25517: https://bugs.torproject.org/25517

7 years agoAdd a missing "return -1" when checking for Ed25519 ID loops
Nick Mathewson [Tue, 22 May 2018 12:54:17 +0000 (08:54 -0400)] 
Add a missing "return -1" when checking for Ed25519 ID loops

Fixes bug 26158; bugfix on 0.3.0.1-alpha.

7 years agoFix a crash bug when testing reachability
Nick Mathewson [Sun, 4 Mar 2018 15:31:17 +0000 (10:31 -0500)] 
Fix a crash bug when testing reachability

Fixes bug 25415; bugfix on 0.3.3.2-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 16 May 2018 16:11:45 +0000 (12:11 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 16 May 2018 16:11:45 +0000 (12:11 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Wed, 16 May 2018 16:11:45 +0000 (12:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'bug26072_029' into maint-0.2.9
Nick Mathewson [Wed, 16 May 2018 16:11:40 +0000 (12:11 -0400)] 
Merge branch 'bug26072_029' into maint-0.2.9

7 years agoMerge branch 'bug26116_029' into bug26116_033
Nick Mathewson [Wed, 16 May 2018 15:43:53 +0000 (11:43 -0400)] 
Merge branch 'bug26116_029' into bug26116_033

7 years agoReturn -1 from our PEM password callback
Nick Mathewson [Wed, 16 May 2018 15:39:42 +0000 (11:39 -0400)] 
Return -1 from our PEM password callback

Apparently, contrary to its documentation, this is how OpenSSL now
wants us to report an error.

Fixes bug 26116; bugfix on 0.2.5.16.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 15 May 2018 13:32:44 +0000 (09:32 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 15 May 2018 13:32:44 +0000 (09:32 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 15 May 2018 13:32:44 +0000 (09:32 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoUpdate geoip and geoip6 to the May 1 2018 database.
Karsten Loesing [Tue, 15 May 2018 13:16:47 +0000 (15:16 +0200)] 
Update geoip and geoip6 to the May 1 2018 database.

7 years agoAdd a missing return after marking a stream for bad connected cell
Nick Mathewson [Mon, 14 May 2018 19:54:48 +0000 (15:54 -0400)] 
Add a missing return after marking a stream for bad connected cell

Fixes bug 26072; bugfix on 0.2.4.7-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 10 May 2018 13:22:32 +0000 (09:22 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 10 May 2018 13:22:32 +0000 (09:22 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1
Nick Mathewson [Thu, 10 May 2018 13:22:14 +0000 (09:22 -0400)] 
Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 10 May 2018 13:19:28 +0000 (09:19 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 10 May 2018 13:19:28 +0000 (09:19 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 10 May 2018 13:19:28 +0000 (09:19 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
Nick Mathewson [Thu, 10 May 2018 13:19:09 +0000 (09:19 -0400)] 
Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

7 years agohs-v3: Add an extra white-space when parsing descriptor
David Goulet [Thu, 10 May 2018 13:16:50 +0000 (09:16 -0400)] 
hs-v3: Add an extra white-space when parsing descriptor

The specification describes the signature token to be right after a newline
(\n) then the token "signature" and then a white-space followed by the encoded
signature.

This commit makes sure that when we parse the signature from the descriptor,
we are always looking for that extra white-space at the end of the token.

It will allow us also to support future fields that might start with
"signature".

Fixes #26069

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 10 May 2018 12:03:04 +0000 (08:03 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 10 May 2018 12:02:10 +0000 (08:02 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 10 May 2018 12:00:35 +0000 (08:00 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoHaving a ControlPort open doesn't mean we are a client
David Goulet [Wed, 9 May 2018 16:40:06 +0000 (12:40 -0400)] 
Having a ControlPort open doesn't mean we are a client

The any_client_port_set() returns true if the ControlPort is set which is
wrong because we can have that port open but still not behave as a tor client
(like many relays for instance).

Fixes #26062

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoTest read bandwidth measurements with empty file
juga0 [Tue, 8 May 2018 16:23:37 +0000 (16:23 +0000)] 
Test read bandwidth measurements with empty file

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 9 May 2018 15:53:18 +0000 (11:53 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
Nick Mathewson [Wed, 9 May 2018 15:53:15 +0000 (11:53 -0400)] 
Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2

7 years agoStop logging stack contents when reading a zero-length bandwidth file
teor [Wed, 2 May 2018 12:33:21 +0000 (22:33 +1000)] 
Stop logging stack contents when reading a zero-length bandwidth file

When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.

Fixes bug 26007; bugfix on 0.2.2.1-alpha.

7 years agoMerge branch 'libressl_201805_033' into maint-0.3.3
Nick Mathewson [Wed, 9 May 2018 12:25:32 +0000 (08:25 -0400)] 
Merge branch 'libressl_201805_033' into maint-0.3.3

7 years agoDetect when v3 services get disabled after HUP.
George Kadianakis [Tue, 8 May 2018 15:14:02 +0000 (18:14 +0300)] 
Detect when v3 services get disabled after HUP.

Remove v3 optimization which made Tor not detect disabling services.

This optimization is not so needed because we only call that function after HUP
anyway.

Fixes bug #25761.

7 years agoDetect when v2 services get disabled after HUP.
George Kadianakis [Tue, 8 May 2018 15:07:08 +0000 (18:07 +0300)] 
Detect when v2 services get disabled after HUP.

During service configuration, rend_service_prune_list_impl_() sets
rend_service_staging_list to NULL, which blocked pruning after a HUP.

This patch initializes rend_service_staging_list when needed, so that HUP can
detect disabled onion services.

Fixes bug #25761.

7 years agomanpage fix to stop saying CacheIPv4DNS is on by default
Roger Dingledine [Tue, 8 May 2018 17:13:45 +0000 (13:13 -0400)] 
manpage fix to stop saying CacheIPv4DNS is on by default

Stop saying in the manual that clients cache ipv4 dns answers from exit
relays. We haven't used them since 0.2.6.3-alpha, and in ticket 24050
we stopped even caching them as of 0.3.2.6-alpha, but we forgot to say
so in the man page.

Fixes bug 26052; bugfix on 0.3.2.6-alpha.

7 years agoMerge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
Nick Mathewson [Mon, 7 May 2018 17:33:12 +0000 (13:33 -0400)] 
Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 3 May 2018 17:38:54 +0000 (13:38 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
Nick Mathewson [Thu, 3 May 2018 17:38:51 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3

7 years agoMerge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
Nick Mathewson [Thu, 3 May 2018 17:38:46 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1

7 years agoMerge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
Nick Mathewson [Thu, 3 May 2018 17:38:37 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9

7 years agoMerge remote-tracking branch 'teor/bug25998' into maint-0.3.3
Nick Mathewson [Thu, 3 May 2018 17:37:33 +0000 (13:37 -0400)] 
Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3