]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
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 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 '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.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.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.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 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 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 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 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 branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 2 May 2018 12:46:28 +0000 (08:46 -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, 2 May 2018 12:46:28 +0000 (08:46 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

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 'bug25936-029' into bug25936-031
Taylor Yu [Thu, 26 Apr 2018 20:46:57 +0000 (15:46 -0500)] 
Merge branch 'bug25936-029' into bug25936-031

7 years agoShow test-suite.log for distcheck on Travis CI
Taylor Yu [Thu, 26 Apr 2018 19:22:52 +0000 (14:22 -0500)] 
Show test-suite.log for distcheck on Travis CI

When Travis CI runs make distcheck, test-suite.log doesn't exist in
the expected place.  Add a new make target to show this file and use
it when DISTCHECK=yes in .travis.yml.  Fixes bug 25814; bug not in any
released Tor.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 25 Apr 2018 12:01:53 +0000 (08:01 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoFix a copy-paste error in the fix for #23693.
Nick Mathewson [Wed, 25 Apr 2018 12:00:55 +0000 (08:00 -0400)] 
Fix a copy-paste error in the fix for #23693.

Found by coverity; CID 25912; bug not in any released Tor.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 24 Apr 2018 14:38:37 +0000 (10:38 -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, 24 Apr 2018 14:38:37 +0000 (10:38 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'travis_distcheck_029' into maint-0.2.9
Nick Mathewson [Tue, 24 Apr 2018 14:38:19 +0000 (10:38 -0400)] 
Merge branch 'travis_distcheck_029' into maint-0.2.9

7 years agoMerge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
Nick Mathewson [Tue, 24 Apr 2018 14:36:17 +0000 (10:36 -0400)] 
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2

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

7 years agoMerge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
Nick Mathewson [Tue, 24 Apr 2018 12:49:20 +0000 (08:49 -0400)] 
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1

7 years agohs: Fix memleak in v3 on SIGHUP
David Goulet [Mon, 23 Apr 2018 15:09:57 +0000 (11:09 -0400)] 
hs: Fix memleak in v3 on SIGHUP

Fixes #25901

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 23 Apr 2018 13:23:31 +0000 (09:23 -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 [Mon, 23 Apr 2018 13:23:31 +0000 (09:23 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'bug24969_029_v2' into maint-0.2.9
Nick Mathewson [Mon, 23 Apr 2018 13:23:25 +0000 (09:23 -0400)] 
Merge branch 'bug24969_029_v2' into maint-0.2.9

7 years agoPermit the nanosleep system call in the seccomp2 callbox
Nick Mathewson [Wed, 18 Apr 2018 14:25:42 +0000 (10:25 -0400)] 
Permit the nanosleep system call in the seccomp2 callbox

Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.

7 years agoAllow cpuworkers to exist without onion keys
Nick Mathewson [Sun, 22 Apr 2018 21:12:18 +0000 (17:12 -0400)] 
Allow cpuworkers to exist without onion keys

Now that we allow cpuworkers for dirport-only hosts (to fix 23693),
we need to allow dup_onion_keys() to succeed for them.

The change to construct_ntor_key_map() is for correctness,
but is not strictly necessary.

7 years agoAdd distcheck support to travis configuration.
Nick Mathewson [Wed, 18 Apr 2018 18:24:54 +0000 (14:24 -0400)] 
Add distcheck support to travis configuration.

Implements 25814.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 17 Apr 2018 14:48:18 +0000 (10:48 -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, 17 Apr 2018 14:47:30 +0000 (10:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoAdd support for the coveralls.io coverage tool in travis config
Nick Mathewson [Mon, 16 Apr 2018 18:42:28 +0000 (14:42 -0400)] 
Add support for the coveralls.io coverage tool in travis config

Closes ticket 25818.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 16 Apr 2018 17:48:23 +0000 (13:48 -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 [Mon, 16 Apr 2018 17:48:23 +0000 (13:48 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoFix an LCOV exclusion pattern in address.c
Nick Mathewson [Mon, 16 Apr 2018 17:48:21 +0000 (13:48 -0400)] 
Fix an LCOV exclusion pattern in address.c

7 years agoFix another crash-on-no-threadpool bug.
Nick Mathewson [Tue, 10 Apr 2018 18:44:38 +0000 (14:44 -0400)] 
Fix another crash-on-no-threadpool bug.

This one happens if for some reason you start with DirPort enabled
but server mode turned off entirely.

Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 10 Apr 2018 18:26:32 +0000 (14:26 -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, 10 Apr 2018 18:26:29 +0000 (14:26 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
Nick Mathewson [Tue, 10 Apr 2018 18:25:57 +0000 (14:25 -0400)] 
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

7 years agoLift the list of default directory servers into their own file.
Alexander Færøy [Fri, 6 Apr 2018 01:58:16 +0000 (03:58 +0200)] 
Lift the list of default directory servers into their own file.

This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.

Patch by beastr0.

See: https://bugs.torproject.org/24854

7 years agoMerge branch 'ticket25296_032_squashed' into maint-0.3.2
Nick Mathewson [Thu, 5 Apr 2018 16:08:53 +0000 (12:08 -0400)] 
Merge branch 'ticket25296_032_squashed' into maint-0.3.2

7 years agoPerConnBW{Rate,Burst} docs: do not say consensus param is always set
Nick Mathewson [Mon, 19 Mar 2018 10:14:57 +0000 (06:14 -0400)] 
PerConnBW{Rate,Burst} docs: do not say consensus param is always set

Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 5 Apr 2018 12:36:13 +0000 (08:36 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoSwitch Travis to stable rust
Taylor Yu [Wed, 4 Apr 2018 22:07:39 +0000 (17:07 -0500)] 
Switch Travis to stable rust

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 5 Apr 2018 12:22:34 +0000 (08:22 -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, 5 Apr 2018 12:22:34 +0000 (08:22 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.9
Nick Mathewson [Thu, 5 Apr 2018 12:22:33 +0000 (08:22 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.9

7 years agoUpdate geoip and geoip6 to the April 3 2018 database. maint-0.2.5
Karsten Loesing [Thu, 5 Apr 2018 08:42:25 +0000 (10:42 +0200)] 
Update geoip and geoip6 to the April 3 2018 database.

7 years agoMerge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2
Nick Mathewson [Tue, 27 Mar 2018 22:24:59 +0000 (18:24 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 27 Mar 2018 22:24:37 +0000 (18:24 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid earlier version of 25629 fix.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 27 Mar 2018 22:23:53 +0000 (18:23 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoFix CID 1430932
Taylor Yu [Mon, 26 Mar 2018 23:05:16 +0000 (18:05 -0500)] 
Fix CID 1430932

Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist.  Fixes bug 25629.

7 years agoFix CID 1430932
Taylor Yu [Mon, 26 Mar 2018 22:51:50 +0000 (17:51 -0500)] 
Fix CID 1430932

Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist.  Fixes bug 25629.

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 26 Mar 2018 14:29:29 +0000 (10:29 -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 [Mon, 26 Mar 2018 14:29:29 +0000 (10:29 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoRemove sb_poll check: all poll() calls are ok.
Nick Mathewson [Tue, 20 Mar 2018 12:30:21 +0000 (08:30 -0400)] 
Remove sb_poll check: all poll() calls are ok.

7 years agoAdd the poll() syscall as permitted by the sandbox
Nick Mathewson [Tue, 20 Mar 2018 12:22:28 +0000 (08:22 -0400)] 
Add the poll() syscall as permitted by the sandbox

Apparently, sometimes getpwnam will call this.

Fixes bug 25513.

7 years agotests: Fix HS test against max IP lifetime.
Isis Lovecruft [Mon, 19 Mar 2018 19:01:17 +0000 (19:01 +0000)] 
tests: Fix HS test against max IP lifetime.

 * FIXES part of #25450: https://bugs.torproject.org/25450

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 19 Mar 2018 09:42:43 +0000 (05:42 -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 [Mon, 19 Mar 2018 09:42:43 +0000 (05:42 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.9
Nick Mathewson [Mon, 19 Mar 2018 09:42:43 +0000 (05:42 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.9

7 years agoMerge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5
Nick Mathewson [Mon, 19 Mar 2018 09:42:38 +0000 (05:42 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5

7 years agoMerge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2
Nick Mathewson [Mon, 19 Mar 2018 09:35:39 +0000 (05:35 -0400)] 
Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 13 Mar 2018 14:59:30 +0000 (10:59 -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, 13 Mar 2018 14:58:02 +0000 (10:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.2.5' into maint-0.2.9
Nick Mathewson [Tue, 13 Mar 2018 14:58:02 +0000 (10:58 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.9

7 years agoUpdate geoip and geoip6 to the March 8 2018 database.
Karsten Loesing [Mon, 12 Mar 2018 13:47:06 +0000 (14:47 +0100)] 
Update geoip and geoip6 to the March 8 2018 database.

7 years agoMerge branch 'bug25474_032' into maint-0.3.2
Nick Mathewson [Tue, 13 Mar 2018 12:41:11 +0000 (13:41 +0100)] 
Merge branch 'bug25474_032' into maint-0.3.2

7 years agoAdd a missing prototype to our libevent configure stanza.
Nick Mathewson [Tue, 13 Mar 2018 12:37:26 +0000 (13:37 +0100)] 
Add a missing prototype to our libevent configure stanza.

Fixes bug 25474; bugfix on 0.3.2.5-alpha.

7 years agochanges: Fix changes file for bug25450.
Isis Lovecruft [Thu, 8 Mar 2018 00:47:34 +0000 (00:47 +0000)] 
changes: Fix changes file for bug25450.

It didn't like me insulting my patch, I guess.

7 years agotest: Increase time limit for IP creation in an HS test.
Isis Lovecruft [Wed, 7 Mar 2018 23:50:00 +0000 (23:50 +0000)] 
test: Increase time limit for IP creation in an HS test.

This should avoid most intermittent test failures on developer and CI machines,
but there could (and probably should) be a more elegant solution.

Also, this test was testing that the IP was created and its expiration time was
set to a time greater than or equal to `now+INTRO_POINT_LIFETIME_MIN_SECONDS+5`:

    /* Time to expire MUST also be in that range. We add 5 seconds because
     * there could be a gap between setting now and the time taken in
     * service_intro_point_new. On ARM, it can be surprisingly slow... */
    tt_u64_op(ip->time_to_expire, OP_GE,
              now + INTRO_POINT_LIFETIME_MIN_SECONDS + 5);

However, this appears to be a typo, since, according to the comment above it,
adding five seconds was done because the IP creation can be slow on some
systems.  But the five seconds is added to the *minimum* time we're comparing
against, and so it actually functions to make this test *more* likely to fail on
slower systems.  (It should either subtract five seconds, or instead add it to
time_to_expire.)

 * FIXES #25450: https://bugs.torproject.org/25450

7 years agobump version to 0.3.2.10-dev
Nick Mathewson [Sat, 3 Mar 2018 16:33:27 +0000 (11:33 -0500)] 
bump version to 0.3.2.10-dev

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sat, 3 Mar 2018 16:33:02 +0000 (11:33 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid version bump

7 years agoversion bump to 0.3.1.10-dev
Nick Mathewson [Sat, 3 Mar 2018 16:32:51 +0000 (11:32 -0500)] 
version bump to 0.3.1.10-dev

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Sat, 3 Mar 2018 16:32:29 +0000 (11:32 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

"ours" merge to avoid version bump.

7 years agoBump version to 0.2.9.15-dev
Nick Mathewson [Sat, 3 Mar 2018 16:32:16 +0000 (11:32 -0500)] 
Bump version to 0.2.9.15-dev

7 years agoversion bump to 0.3.2.10
Nick Mathewson [Thu, 1 Mar 2018 21:43:35 +0000 (16:43 -0500)] 
version bump to 0.3.2.10

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 1 Mar 2018 21:43:10 +0000 (16:43 -0500)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" to avoid version bump.

7 years agoUpdate to 0.3.1.10
Nick Mathewson [Thu, 1 Mar 2018 21:43:01 +0000 (16:43 -0500)] 
Update to 0.3.1.10

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Thu, 1 Mar 2018 21:42:25 +0000 (16:42 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

"ours" merge to avoid version bump.