ccf1eb3164
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.
2018-06-16 13:08:40 -04:00
71065201dd
Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
2018-06-14 12:47:09 -04:00
ee860b8f37
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.
2018-06-13 12:21:25 -04:00
ca6d289c00
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:59:28 -04:00
7e7585d0a1
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-13 09:59:28 -04:00
9713ecfc40
Fix an extra space in a changes file
2018-06-13 09:59:26 -04:00
049ba66746
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:58:05 -04:00
6017447e3a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-13 09:58:04 -04:00
94f3007627
Merge branch 'bug26158_031' into maint-0.3.1
2018-06-13 09:58:01 -04:00
1c80eb92fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:57:10 -04:00
ff70cc84f8
Merge branch 'bug25686_diagnostic_032' into maint-0.3.2
2018-06-13 09:56:17 -04:00
bbbb5f39be
bump to 0.3.3.7-dev
2018-06-12 12:05:09 -04:00
16381b579e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 09:44:17 -04:00
53513e4bfe
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 09:44:17 -04:00
eaa359650c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 09:44:17 -04:00
ef671147f2
Merge branch 'dannenberg_ipv6_029' into maint-0.2.9
2018-06-12 09:44:13 -04:00
2ef448da2f
Add a changelog entry.
2018-06-12 09:44:01 -04:00
6cf9288518
Add IPv6 orport address for dannenberg.
2018-06-12 09:44:01 -04:00
f2e7570c75
Bump to 0.3.3.7
2018-06-12 08:57:09 -04:00
5d8a927aa3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 08:18:56 -04:00
7fff99110b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 08:18:56 -04:00
d84581a3e6
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
2018-06-12 08:18:53 -04:00
74ac463e7f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 08:11:20 -04:00
6dca180ae9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 08:11:20 -04:00
19f3868523
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 08:11:19 -04:00
faf4580061
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.
2018-06-11 16:24:00 -04:00
ae540569ce
Update geoip and geoip6 to the June 7 2018 database.
2018-06-11 21:58:55 +02:00
a141127435
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-08 10:12:57 -04:00
dd63033fcb
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-08 10:11:57 -04:00
1ef8023e00
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-08 10:11:57 -04:00
719b5c1d27
Avoid out-of-bounds smartlist access in protover_compute_vote()
...
and contract_protocol_list()
2018-06-08 10:11:32 -04:00
8366be3b51
Silence unused-const-variable warnings in zstd.h on some gcc versions
...
Fixes bug 26272; bugfix on 0.3.1.1-alpha.
2018-06-02 14:11:04 -07:00
f15f90e2ca
Merge branch 'bug26121-033-squashed' into maint-0.3.3
2018-06-02 10:36:44 -07:00
fe5764012a
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.
2018-06-02 10:36:36 -07:00
9d06c41c6e
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
2018-05-31 17:15:57 -07:00
fa1890e97f
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
2018-05-27 10:03:11 -04:00
3f3739c6e0
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-24 09:40:06 -04:00
f48fb8a720
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-24 09:40:06 -04:00
0ef432d457
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-24 09:40:06 -04:00
c000763f1e
Merge branch 'bug26116_033' into maint-0.3.3
2018-05-24 09:40:00 -04:00
c380562aed
Merge branch 'bug26116_029' into maint-0.2.9
2018-05-24 09:39:46 -04:00
aeb4be1d5a
Add a unit test for PEM-encrypted documents.
2018-05-24 09:36:33 -04:00
ff27b7ce60
Update version to 0.3.3.6-dev
2018-05-22 18:05:28 -04:00
80d673ccea
Merge branch 'trove-2018-005_032' into maint-0.3.3
2018-05-22 14:13:23 -04:00
7483aef896
avoid a signed/unsigned comparison.
2018-05-22 14:12:44 -04:00
a5d4ce2b39
Make the TROVE-2018-005 fix work with rust.
2018-05-22 13:35:20 -04:00
6e8e005b53
Merge branch 'trove-2018-005_032' into maint-0.3.3
2018-05-22 12:54:26 -04:00
240bb17714
uint breaks compilation on windows
2018-05-22 12:54:05 -04:00
074b182baa
version bump to 0.3.3.6
2018-05-22 12:40:18 -04:00
569b4e57e2
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
2018-05-22 12:27:25 -04:00
Nick Mathewson
Linus Nordberg
Karsten Loesing
rl1987
teor
Mike Perry
Isis Lovecruft