]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 13:44:17 +0000 (09:44 -0400)] 
Merge branch 'maint-0.3.3'

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 '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.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 '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 agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 12 Jun 2018 12:57:25 +0000 (08:57 -0400)] 
Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump.

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 agoRemove folded-in changes files
Nick Mathewson [Tue, 12 Jun 2018 12:56:28 +0000 (08:56 -0400)] 
Remove folded-in changes files

7 years agoLightly edit changelog
Nick Mathewson [Tue, 12 Jun 2018 12:46:35 +0000 (08:46 -0400)] 
Lightly edit changelog

Remove the "documentation" section, since a comment-only change
doesn't usually get a changelog entry.

7 years agoformat changelog.
Nick Mathewson [Tue, 12 Jun 2018 12:36:48 +0000 (08:36 -0400)] 
format changelog.

7 years agoadd more entries to changelog
Nick Mathewson [Tue, 12 Jun 2018 12:36:28 +0000 (08:36 -0400)] 
add more entries to changelog

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

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 remote-tracking branch 'rl1987/bug26283'
Nick Mathewson [Tue, 12 Jun 2018 12:17:48 +0000 (08:17 -0400)] 
Merge remote-tracking branch 'rl1987/bug26283'

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.3.3'
Nick Mathewson [Tue, 12 Jun 2018 12:11:20 +0000 (08:11 -0400)] 
Merge branch '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 agobump to 0.3.4.2-alpha
Nick Mathewson [Mon, 11 Jun 2018 20:49:09 +0000 (16:49 -0400)] 
bump to 0.3.4.2-alpha

7 years agostart the 0.3.4.2-alpha changelog
Nick Mathewson [Mon, 11 Jun 2018 20:37:08 +0000 (16:37 -0400)] 
start the 0.3.4.2-alpha changelog

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 remote-tracking branch 'mikeperry-github/bug26259'
Nick Mathewson [Fri, 8 Jun 2018 14:17:00 +0000 (10:17 -0400)] 
Merge remote-tracking branch 'mikeperry-github/bug26259'

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.3'
Nick Mathewson [Fri, 8 Jun 2018 14:12:57 +0000 (10:12 -0400)] 
Merge branch '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 agoMerge branch 'maint-0.3.3'
Nick Mathewson [Fri, 8 Jun 2018 14:11:57 +0000 (10:11 -0400)] 
Merge branch 'maint-0.3.3'

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

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 -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)
rl1987 [Sun, 3 Jun 2018 13:45:09 +0000 (16:45 +0300)] 
Silence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)

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 remote-tracking branch 'rl1987/doc25237'
Nick Mathewson [Sat, 2 Jun 2018 18:35:06 +0000 (11:35 -0700)] 
Merge remote-tracking branch 'rl1987/doc25237'

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

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 agoMerge branch 'bug25939_034_01_squashed'
Nick Mathewson [Sat, 2 Jun 2018 17:33:33 +0000 (10:33 -0700)] 
Merge branch 'bug25939_034_01_squashed'

7 years agohs-v3: Build onion address before registering ephemeral service
David Goulet [Wed, 23 May 2018 15:49:02 +0000 (11:49 -0400)] 
hs-v3: Build onion address before registering ephemeral service

With the work on #25500 (reducing CPU client usage), the HS service main loop
callback is enabled as soon as the HS service map changes which happens when
registering a new service.

Unfortunately, for an ephemeral service, we were building the onion address
*after* the registration leading to the "service->onion_address` to be an
empty string.

This broke the "HS_DESC CREATED" event which had no onion address in it. And
also, we were logging an empty onion address for that service.

Fixes #25939

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoPoint reader to a section in tor-spec.txt
rl1987 [Sat, 2 Jun 2018 08:15:10 +0000 (11:15 +0300)] 
Point reader to a section in tor-spec.txt

7 years agoBug 26259: Changes file.
Mike Perry [Fri, 1 Jun 2018 00:24:00 +0000 (00:24 +0000)] 
Bug 26259: Changes file.

7 years agoBug 26259: Don't count 0-length RELAY_COMMAND_DATA in CIRC_BW OVERHEAD
Mike Perry [Fri, 1 Jun 2018 00:23:08 +0000 (00:23 +0000)] 
Bug 26259: Don't count 0-length RELAY_COMMAND_DATA in CIRC_BW OVERHEAD

This cell should be treated as invalid for purposes of CIRC_BW.

7 years agoFix various typos
Nick Mathewson [Wed, 30 May 2018 14:57:22 +0000 (07:57 -0700)] 
Fix various typos

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Sun, 27 May 2018 14:04:42 +0000 (10:04 -0400)] 
Merge branch 'maint-0.3.3'

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.3'
Nick Mathewson [Thu, 24 May 2018 13:40:06 +0000 (09:40 -0400)] 
Merge branch 'maint-0.3.3'

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 agoMerge branch 'appveyor_min_034_v2'
Nick Mathewson [Wed, 23 May 2018 19:08:50 +0000 (15:08 -0400)] 
Merge branch 'appveyor_min_034_v2'

7 years agoMerge branch 'bug26156_034'
Nick Mathewson [Wed, 23 May 2018 13:08:57 +0000 (09:08 -0400)] 
Merge branch 'bug26156_034'

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 agoremove the now-duplicate 0.3.3.6 stanzas
Roger Dingledine [Tue, 22 May 2018 22:03:25 +0000 (18:03 -0400)] 
remove the now-duplicate 0.3.3.6 stanzas

7 years agocopy changelog and releasenotes from 0.3.3.6
Nick Mathewson [Tue, 22 May 2018 22:07:10 +0000 (18:07 -0400)] 
copy changelog and releasenotes from 0.3.3.6

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 22 May 2018 22:05:42 +0000 (18:05 -0400)] 
Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump.

7 years agoforward-port all those changelog changes
Roger Dingledine [Tue, 22 May 2018 20:17:56 +0000 (16:17 -0400)] 
forward-port all those changelog changes

7 years agoreorder 0.3.3.3-alpha changelog
Roger Dingledine [Tue, 22 May 2018 18:34:53 +0000 (14:34 -0400)] 
reorder 0.3.3.3-alpha changelog

(it came out before 0.3.2.10, because 0.3.2.10 has backports from it)

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

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 agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 22 May 2018 17:35:33 +0000 (13:35 -0400)] 
Merge branch 'maint-0.3.3'

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 'maint-0.3.3'
Nick Mathewson [Tue, 22 May 2018 16:54:31 +0000 (12:54 -0400)] 
Merge branch 'maint-0.3.3'

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 agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 22 May 2018 16:40:40 +0000 (12:40 -0400)] 
Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump

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 agoMerge branch 'trove-2018-005_034'
Nick Mathewson [Tue, 22 May 2018 16:33:49 +0000 (12:33 -0400)] 
Merge branch 'trove-2018-005_034'

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 22 May 2018 16:33:09 +0000 (12:33 -0400)] 
Merge branch 'maint-0.3.3'

"Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005
fix, which touches the files in their old locations.

7 years agofix wide lines
Nick Mathewson [Tue, 22 May 2018 16:32:00 +0000 (12:32 -0400)] 
fix wide lines

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 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 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 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 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 include to get the declaration of OPENSSL_1_1_API
Nick Mathewson [Tue, 22 May 2018 14:05:27 +0000 (10:05 -0400)] 
Add a missing include to get the declaration of OPENSSL_1_1_API

Apparently, even though I had tested on OpenSSL 1.1.1 with
no-deprecated, OpenSSL 1.1.0 is different enough that I should have
tested with that as well.

Fixes bug 26156; bugfix on 0.3.4.1-alpha where we first declared
support for this configuration.

7 years agoMerge branch 'appveyor_min_029_v2' into appveyor_min_034_v2
Nick Mathewson [Tue, 22 May 2018 13:57:12 +0000 (09:57 -0400)] 
Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2

7 years agochanges file for appveyor support
Nick Mathewson [Mon, 21 May 2018 21:24:17 +0000 (17:24 -0400)] 
changes file for appveyor support

7 years agoAppveyor configuration files.
Nick Mathewson [Mon, 21 May 2018 19:29:32 +0000 (15:29 -0400)] 
Appveyor configuration files.

Original by Marcin Cieślak, with modifications from Isis Lovecruft
and Nick Mathewson.

7 years agoMerge branch 'bug26101_26102'
Nick Mathewson [Tue, 22 May 2018 12:42:04 +0000 (08:42 -0400)] 
Merge branch 'bug26101_26102'

7 years agoremove already-merged changes file
Nick Mathewson [Tue, 22 May 2018 12:36:03 +0000 (08:36 -0400)] 
remove already-merged changes file

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 22 May 2018 12:35:41 +0000 (08:35 -0400)] 
Merge branch 'maint-0.3.3'

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 agoPython script for IRC notifications from appveyor
Nick Mathewson [Mon, 21 May 2018 19:23:53 +0000 (15:23 -0400)] 
Python script for IRC notifications from appveyor

Original by Christopher Wood, with modifications by nexB, Isis
Lovecruft, and Marcin Cieślak.

7 years agoWhoops -- add an entry I missed to the 0.3.4.1-alpha changelog
Nick Mathewson [Thu, 17 May 2018 16:47:06 +0000 (12:47 -0400)] 
Whoops -- add an entry I missed to the 0.3.4.1-alpha changelog

7 years agobump to 0.3.4.1-alpha-dev
Nick Mathewson [Thu, 17 May 2018 13:44:31 +0000 (09:44 -0400)] 
bump to 0.3.4.1-alpha-dev

7 years agoincrement changelog date tor-0.3.4.1-alpha
Nick Mathewson [Thu, 17 May 2018 13:00:49 +0000 (09:00 -0400)] 
increment changelog date

7 years agoBump version to 0.3.4.1-alpha; contemplate a release
Nick Mathewson [Wed, 16 May 2018 18:40:28 +0000 (14:40 -0400)] 
Bump version to 0.3.4.1-alpha; contemplate a release

7 years agoAdd comments explaining when a connected cell has an UNSPEC addr
Nick Mathewson [Wed, 16 May 2018 18:09:18 +0000 (14:09 -0400)] 
Add comments explaining when a connected cell has an UNSPEC addr

Should prevent other bugs like 26117.

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