Nick Mathewson
eacaff6ccc
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
2018-09-07 08:46:41 -04:00
Nick Mathewson
9fcb3ef787
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
2018-09-07 08:46:35 -04:00
Nick Mathewson
7e91eb83d8
Merge branch 'maint-0.3.4'
2018-09-07 08:45:10 -04:00
Nick Mathewson
df18cf0e8f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:44:40 -04:00
Nick Mathewson
a4930de5e9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:44:40 -04:00
Nick Mathewson
a5ed62f96c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:44:39 -04:00
Nick Mathewson
912ae2b8dc
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
2018-09-07 08:44:36 -04:00
Nick Mathewson
08d5fd39d8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:42:19 -04:00
Nick Mathewson
b6de39e5f4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:42:19 -04:00
Nick Mathewson
a08e6e711f
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:42:19 -04:00
teor
e70cf82625
Appveyor: Disable gcc hardening in Windows 64-bit builds
...
As of August 29, 2018, Appveyor images come with gcc 8.2.0 by
default. 64-bit Windows executables compiled with gcc 8.2.0 and
tor's --enable-gcc-hardening crash.
Fixes bug 27460; bugfix on 0.3.4.1-alpha.
2018-09-07 13:52:20 +10:00
teor
d2105ff5d5
Merge branch 'bug27461-029' into bug27461-032
...
Fix a minor merge conflict due to an #endif comment.
2018-09-07 13:00:34 +10:00
teor
8ef4bb7f3e
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.
2018-09-07 12:58:11 +10:00
teor
9d5c6317b5
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.
2018-09-07 12:40:11 +10:00
teor
1570f17f97
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.
2018-09-07 11:03:10 +10:00
Nick Mathewson
8815960c46
Merge remote-tracking branch 'tor-github/pr/294'
2018-09-06 09:47:32 -04:00
Nick Mathewson
6edee54afa
Changes file for 25132
2018-09-06 09:31:39 -04:00
Nick Mathewson
bcfab63ca5
Merge remote-tracking branch 'teor/ticket27467'
2018-09-06 09:24:47 -04:00
teor
d0965561a5
Remove GetAdaptersAddresses_fn_t
...
The code that used it was removed as part of the 26481 refactor.
Closes ticket 27467.
2018-09-06 12:54:03 +10:00
Nick Mathewson
06c14f9209
Merge branch 'maint-0.3.4'
2018-09-05 10:16:11 -04:00
Nick Mathewson
2b04163666
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-05 10:16:06 -04:00
Nick Mathewson
a7e72f0c44
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-05 10:15:45 -04:00
Nick Mathewson
57b207efa4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-05 10:15:42 -04:00
Nick Mathewson
ff1486385a
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
2018-09-05 10:14:56 -04:00
Nick Mathewson
75da2045c5
Merge branch 'maint-0.3.4'
2018-09-05 10:01:31 -04:00
Nick Mathewson
b390983b27
Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
2018-09-05 10:01:27 -04:00
Nick Mathewson
67bdd144bd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-05 09:56:19 -04:00
Nick Mathewson
2b1b8bf2ca
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-05 09:56:19 -04:00
Nick Mathewson
2f618094d2
Merge branch 'maint-0.3.4'
2018-09-05 09:56:19 -04:00
Nick Mathewson
4ab033c3bc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-05 09:56:19 -04:00
teor
d6779a9013
Stop reinstalling identical packages in our Windows CI
...
Fixes bug 27464; bugfix on 0.3.4.1-alpha.
2018-09-05 21:23:28 +10:00
teor
35b0ac8d84
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.
2018-09-05 14:02:46 +10:00
teor
d3a3ac013d
Appveyor: tail config.log and cat test-suite.log after failed builds
...
Also zip the full logs, and upload them as build artifacts.
Implements ticket 27430.
2018-09-05 13:51:12 +10:00
teor
4e4b6a2476
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.
2018-09-05 13:12:54 +10:00
teor
90e038e732
Appveyor: always log the compiler path and version
...
Implements 27449.
2018-09-05 10:50:17 +10:00
Nick Mathewson
0db5c54957
Merge branch 'nss_squashed' into nss_merge
2018-09-04 20:21:07 -04:00
Nick Mathewson
c18967d6c8
changes file for our NSS support
2018-09-04 14:52:35 -04:00
Nick Mathewson
fd994f55c4
Merge remote-tracking branch 'rl1987/doc26908'
2018-09-04 11:08:49 -04:00
Nick Mathewson
3507fead10
Merge branch 'tor_api_owning_control'
2018-09-04 11:04:21 -04:00
Nick Mathewson
94b04d6c64
Merge branch 'bug24104_029_squashed'
2018-09-04 10:44:36 -04:00
cypherpunks
f8c0f694b7
app/config: reject non-UTF-8 ContactInfo
...
Closes ticket #27428 .
2018-09-03 14:31:03 +00:00
rl1987
19f73f6336
Add changes file
2018-09-02 21:14:03 +03:00
juga0
bbb82a5249
Add changes file
2018-09-01 18:47:20 -04:00
Nick Mathewson
94605f08fb
Merge branch 'ticket27246_035_01_squashed'
2018-08-29 15:05:05 -04:00
Nick Mathewson
7f1895c39a
Changes for 27246
2018-08-29 15:02:59 -04:00
Mike Perry
93ff8b411a
Merge branch 'ticket25573-034' into ticket25573-master
2018-08-29 17:10:06 +00:00
Nick Mathewson
a28c14aad5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-29 11:17:31 -04:00
Nick Mathewson
b40f9967fa
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-29 11:17:31 -04:00
Nick Mathewson
0ea622aa3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-29 11:17:31 -04:00
Nick Mathewson
810152b20f
Merge branch 'maint-0.3.4'
2018-08-29 11:17:31 -04:00
Mike Perry
c56f63eadb
Ticket #25573 : Track half-closed stream ids
...
We allow their CONNECTEDs, RESOLVEDs, ENDs, SENDMEs, and DATA cells to not
count as dropped until the windows are empty, or we get an END.
This commit does not change behavior. It only changes CIRC_BW event field
values.
2018-08-29 04:12:09 +00:00
teor
541b89b061
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.
2018-08-29 10:47:20 +10:00
Nick Mathewson
48632455a5
Merge branch 'bug26367_035_01'
2018-08-28 16:02:04 -04:00
David Goulet
4976eca826
hs: Render obsolete Tor2web
...
Remove support for Tor2web in the code and build system. At this commit, tor
doesn't have Tor2web support anymore.
Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html
Close #26367
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-08-28 16:01:57 -04:00
Nick Mathewson
b1d32a9223
Merge remote-tracking branch 'dgoulet/ticket27215_035_01'
2018-08-28 16:00:45 -04:00
David Goulet
4e2dcda092
fixup! hs: Change default version from 2 to 3
2018-08-28 15:58:28 -04:00
Nick Mathewson
2bc4c55d7d
Merge remote-tracking branch 'tor-github/pr/245'
2018-08-28 15:44:06 -04:00
Nick Mathewson
3b960df4f9
Merge branch 'bug26896_034'
2018-08-28 12:35:50 -04:00
rl1987
3890ad2578
Stricter HiddenServicePort parsing
2018-08-28 18:32:31 +03:00
Nick Mathewson
64c3c6a790
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-27 09:39:08 -04:00
Nick Mathewson
0483f7f64c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-27 09:39:08 -04:00
Nick Mathewson
103dd68ba8
Merge branch 'maint-0.3.4'
2018-08-27 09:39:08 -04:00
teor
70a07fa90b
When running make test-network-all, use the mixed+hs-v2 network
...
No behaviour change.
A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.
Fixes bug 27345; bugfix on 0.3.2.1-alpha.
2018-08-27 23:07:20 +10:00
Nick Mathewson
4c3b43604b
Merge remote-tracking branch 'teor/ticket27211'
2018-08-24 12:45:42 -04:00
Nick Mathewson
622231ce2e
Merge remote-tracking branch 'teor/bug27237'
2018-08-24 12:44:46 -04:00
Nick Mathewson
b1d0fa04fb
Merge branch 'maint-0.3.4'
2018-08-24 12:35:26 -04:00
Nick Mathewson
658171318f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-24 12:35:23 -04:00
Nick Mathewson
33e4e30d0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-24 12:32:10 -04:00
Nick Mathewson
98e1a1d106
Merge branch 'ticket27286_032_v2' into maint-0.3.2
2018-08-24 12:32:06 -04:00
Nick Mathewson
14be9cba4e
Update the protocol versions recommendations to remove LinkAuth=1
...
LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.
As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning. Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.
Closes ticket 27286
2018-08-24 12:31:01 -04:00
Nick Mathewson
49fe7f24d6
Remove changes entries for stuff that is already in maint-0.3.4
2018-08-24 09:15:34 -04:00
teor
7a5896d5d4
Bootstrap: try harder to get descriptors in non-exit test networks
...
Use the mid weight for the third hop when there are no exits.
Fixes bug 27237; bugfix on 0.2.6.2-alpha.
2018-08-24 12:49:05 +10:00
teor
4217dc0558
Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney
...
Supports bisection on 0.3.4 and earlier.
Recommend that users copy the script before bisecting.
Implements ticket 27211.
2018-08-24 12:46:04 +10:00
Nick Mathewson
d0007db1f0
Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4
2018-08-23 20:44:06 -04:00
teor
8425091718
Appveyor CI: Changes file for 26979
...
Closes 26979.
2018-08-24 10:11:20 +10:00
Nick Mathewson
9323f5d1d4
Merge branch 'maint-0.3.4'
2018-08-23 20:07:47 -04:00
Nick Mathewson
90f6c590af
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
2018-08-23 20:07:39 -04:00
teor
08ad1f1e46
CI: Only post Appveyor IRC notifications when the build fails
...
Implements 27275.
2018-08-24 10:06:06 +10:00
Nick Mathewson
d50f90bfc4
Merge branch 'maint-0.3.4'
2018-08-23 19:37:32 -04:00
Nick Mathewson
e01ea64f0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-23 19:36:45 -04:00
Nick Mathewson
36bb11a650
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-23 19:36:45 -04:00
Nick Mathewson
6e0872e867
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-23 19:36:45 -04:00
teor
cc4ea34a26
Silence a compilation warning on MSVC 2017 and clang-cl
...
test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().
Fixes bug 27185; bugfix on 0.2.2.2-alpha.
2018-08-24 09:15:04 +10:00
Nick Mathewson
2ae92ab973
Merge branch 'maint-0.3.4'
2018-08-23 14:26:04 -04:00
teor
fadcab920b
Bootstrap: check the exit policy and flag on descriptors
...
Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.
After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.
Fixes 27236; bugfix on 0.2.6.3-alpha.
2018-08-24 01:13:53 +10:00
teor
692efdad09
Update the message logged on relays when DirCache is disabled
...
Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard
flag.
Fixes bug 24312; bugfix on 0.3.3.5-rc.
2018-08-23 19:13:25 +10:00
teor
da17875ea5
Travis: Don't do a distcheck with --disable-module-dirauth
...
Part of 27252.
2018-08-23 18:20:39 +10:00
teor
e8dd83aecb
Merge branch 'ticket27252-033' into ticket27252-034
...
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
2018-08-23 18:20:17 +10:00
teor
ae2085dd7b
Merge branch 'ticket27252-032' into ticket27252-033
...
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
- TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
2018-08-23 18:19:42 +10:00
teor
92f1a8af83
Travis: Skip offline rust builds for Linux gcc
...
We already do an online rust build for Linux gcc.
Part of 27252.
2018-08-23 18:18:14 +10:00
teor
b61d40c8a2
Travis: Only run one online rust build, to reduce network errors
...
Part of 27252.
2018-08-23 18:17:03 +10:00
teor
99a2ecc795
Merge branch 'ticket27252-029' into ticket27252-032
...
This commit is already implemented in 0.3.2 and later:
- Travis: Skip a duplicate hardening-off build in Tor 0.2.9
2018-08-23 18:15:55 +10:00
teor
7cea5a287f
Travis: Skip gcc on Linux with default settings
...
It's redundant, because all the non-default builds use gcc on Linux.
Part of 27252.
2018-08-23 18:13:53 +10:00
teor
7ec84cc094
Travis: Skip a duplicate hardening-off build in Tor 0.2.9
...
Part of 27252.
2018-08-23 17:08:28 +10:00
teor
8f89fb8f39
Travis: skip gcc on OSX, because the default compiler is clang
...
Part of #27252 .
2018-08-23 17:02:32 +10:00
Nick Mathewson
bf5704051c
Merge remote-tracking branch 'teor/travis-osx-master'
2018-08-21 20:04:13 -04:00
Nick Mathewson
aac1e17f22
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
2018-08-21 20:04:03 -04:00
Nick Mathewson
f0633bc491
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
2018-08-21 20:03:56 -04:00
Nick Mathewson
a29e9a901d
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
2018-08-21 20:03:41 -04:00
Nick Mathewson
05d62a3b73
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
2018-08-21 20:03:19 -04:00
Nick Mathewson
de66bd397c
Merge branch 'maint-0.3.4'
2018-08-21 19:20:37 -04:00
Nick Mathewson
f68aab83ba
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 19:20:31 -04:00
Nick Mathewson
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 19:16:40 -04:00
Nick Mathewson
d52f406001
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-21 19:16:40 -04:00
Nick Mathewson
ff0be08059
Fix a bug warning when sending an error on an HTTPTunnelPort conn
...
Fixes bug 26470; bugfix on 0.3.2.1-alpha.
2018-08-21 10:12:04 -04:00
Nick Mathewson
df874ed0f1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 10:01:41 -04:00
Nick Mathewson
9bc947dc18
Merge branch 'maint-0.3.4'
2018-08-21 10:01:41 -04:00
Nick Mathewson
4c0c4d4ade
Add changes file for 26873. I missed this when merging earlier.
2018-08-21 10:01:38 -04:00
Nick Mathewson
18183de060
Check for duplicate-close in connection_dir_finished_flusing()
...
Fix for 26896.
2018-08-21 09:50:48 -04:00
Neel Chauhan
eb2b130ad9
If ExitRelay is not specified, emulate the behavior of "ExitRelay 0"
2018-08-20 20:25:23 -04:00
Nick Mathewson
85a8792344
Rewrite test_tortls_cert_matches_key()
...
Unlike the old test, this test no will no longer mess around with
the forbidden internals of any openssl data structures.
Additionally, it verifies several other behaviors of
tor_tls_cert_matches_key() that we had wanted to verify, such as
the possibility of the certificate's key not matching.
Fixes bug 27226; bugfix on 0.2.5.1-alpha.
2018-08-20 17:43:41 -04:00
rl1987
c6a154e7b8
Add changes file
2018-08-19 21:05:17 +03:00
Nick Mathewson
700f5bcc43
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-17 09:38:26 -04:00
Nick Mathewson
e0b8c53f56
Merge branch 'maint-0.3.4'
2018-08-17 09:38:26 -04:00
Nick Mathewson
87aacbfbba
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
2018-08-17 09:38:08 -04:00
cypherpunks
7b7dd9ae1c
rust/protover: don't accept whitespace in ProtoSet::from_str()
...
It's impossible for spaces to get here, since spaces are used as
separators between individual protocol entries higher up.
And it shouldn't ignore whitespace that isn't a literal space
character, because that would differ from the C implementation.
These were added in 9925d2e687Fixes #27177 . Bugfix on 0.3.3.5-rc.
2018-08-17 13:34:03 +00:00
Nick Mathewson
ac721bd3b4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-17 09:29:46 -04:00
Nick Mathewson
bedc0b0b8f
Merge branch 'maint-0.3.4'
2018-08-17 09:29:46 -04:00
cypherpunks
cc93f175ed
rust/protover: fix hyphen parsing bug in ProtoSet::from_str()
...
It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen
and everything after.
Introduced in d1820c1516Fixes #27164 ; bugfix on 0.3.3.1-alpha.
2018-08-17 13:27:24 +00:00
Neel Chauhan
64d9ea1413
In addrs_in_same_network_family(), choose IP subnet size based on IP type
2018-08-17 13:37:51 +10:00
Nick Mathewson
936e2aa0de
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:37:11 -04:00
Nick Mathewson
b49355915b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-16 08:37:11 -04:00
Nick Mathewson
7e50d43f07
Merge branch 'maint-0.3.4'
2018-08-16 08:37:11 -04:00
George Kadianakis
c798957b59
Keep descriptor rotation time after HUP occurs.
2018-08-16 08:36:48 -04:00
Nick Mathewson
d029a5162d
Merge branch 'ticket27096'
2018-08-16 08:32:06 -04:00
rl1987
f454c28303
Fix test to pass without HOME env being set
2018-08-16 08:31:45 -04:00
Nick Mathewson
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
Nick Mathewson
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
Nick Mathewson
34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
Nick Mathewson
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
Nick Mathewson
6c1d2549df
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 02:16:23 -04:00
Nick Mathewson
1868982de6
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
2018-08-15 02:16:19 -04:00
Nick Mathewson
b329cdf768
Merge remote-tracking branch 'public/bug26779_035'
2018-08-15 02:14:17 -04:00
Nick Mathewson
57d0b8c3cd
Merge remote-tracking branch 'tor-github/pr/206'
2018-08-11 10:14:29 -04:00
Nick Mathewson
c775689e96
Merge remote-tracking branch 'tor-github/pr/244'
2018-08-11 10:05:15 -04:00
Nick Mathewson
61d5bcc1a2
Merge remote-tracking branch 'tor-github/pr/268'
2018-08-11 10:04:04 -04:00
Nick Mathewson
b7ed61167f
Merge remote-tracking branch 'tor-github/pr/239'
2018-08-10 12:35:06 -04:00
teor
ed1210d0f1
Merge branch 'travis-osx-032' into travis-osx-033
...
Preserve 033 changes since 032.
2018-08-10 16:38:13 +10:00
teor
f5aa667d48
Travis: Check Rust with distcheck in 0.3.3 and later
...
Backports an 0.3.4 change that also works in 0.3.3.
Part of 24629.
2018-08-10 16:37:06 +10:00
teor
69adc68ac6
Merge branch 'travis-osx-029' into travis-osx-032
...
Simple merge to resolve order conflicts.
2018-08-10 16:31:35 +10:00
teor
ace98493bd
Merge branch 'travis-osx-034' into travis-osx-master
...
Replace master .travis.yml with 034 .travis.yml.
All the changes in master have been backported to the
034 .travis.yml already.
Replace master src/test/test_rust.sh with 034
src/test/test_rust.sh, which was backported from
master. One 033/034-specific commit needs to be
reverted.
2018-08-10 13:28:19 +10:00
teor
6e0be81211
Merge branch 'travis-osx-033' into travis-osx-034
...
Replace 034 .travis.yml with 033 .travis.yml.
Subsequent commits will restore 034 functionality.
Replace 034 src/test/test_rust.sh with 033
src/test/test_rust.sh, which was backported from
master.
2018-08-10 13:15:16 +10:00
teor
a5715a46c4
Changes file for Travis: enable macOS builds
2018-08-10 12:44:31 +10:00
teor
7ec75e014f
Travis: Check Rust with distcheck in 0.3.3 and later
...
Backports an 0.3.4 change that also works in 0.3.3.
Part of 24629.
2018-08-10 12:44:20 +10:00
teor
4cd3fcf248
Changes file for Travis: enable macOS builds
2018-08-10 12:10:56 +10:00
teor
229a75a49a
Rust: use a consistent working directory in builds and tests
...
cd to ${abs_top_builddir}/src/rust before running cargo in
src/test/test_rust.sh.
Fixes bug 26497; bugfix on 0.3.3.2-alpha.
2018-08-10 11:54:26 +10:00
teor
2b9dd0f9c0
Merge branch 'travis-osx-032' into travis-osx-033
...
Replace 033 .travis.yml with 032 .travis.yml.
Subsequent commits will restore 033 functionality.
src/rust/tor_util/include.am is deleted in 033.
Subsequent commits will apply 032 changes to
src/rust/tor_rust/include.am.
Replace 033 src/test/test_rust.sh with 032
src/test/test_rust.sh, which was backported from
master.
2018-08-10 11:43:17 +10:00
teor
4517c4c3e3
Changes file for Rust: backport src/test/test_rust.sh from master
2018-08-10 11:26:53 +10:00
teor
3b1c74baa5
Travis: Use cargo cache
...
Closes ticket 26952.
2018-08-10 11:23:26 +10:00
teor
c9ad16ca2a
Fix $abs_top_srcdir in test_rust.sh
...
Consistently use ../../.. as a fallback for $abs_top_srcdir in
test_rust.sh.
Fixes bug 27093; bugfix on 0.3.4.3-alpha.
2018-08-10 11:22:36 +10:00
teor
ce19477ffc
Stop setting $CARGO_HOME
...
cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.
Fixes bug 26497; bugfix on 0.3.1.5-alpha.
2018-08-10 11:14:32 +10:00
Nick Mathewson
5980cb8a19
Merge branch 'maint-0.3.4'
2018-08-09 08:47:26 -04:00
Nick Mathewson
b4362b99cf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-09 08:47:25 -04:00
Nick Mathewson
fde551a387
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-09 08:47:25 -04:00
Nick Mathewson
8982719f6a
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-09 08:47:24 -04:00
teor
e4d7f2667c
Travis: add lzma and zstd, where available
...
Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9
merge.
Part of 24629, also fixes 27090.
2018-08-09 22:22:27 +10:00
teor
38cf52b023
Merge branch 'travis-osx-029' into travis-osx-032
...
Replace 032 .travis.yml with 029 .travis.yml.
Subsequent commits will restore 032 functionality.
2018-08-09 22:20:29 +10:00
teor
23b242104b
Travis: run an asciidoc build
...
Implements 27087.
2018-08-09 22:19:00 +10:00
teor
286a6bc3b8
Travis: Use ccache
...
Part of ticket 26952.
2018-08-09 22:18:53 +10:00
teor
7cf7b52fca
Travis: create configure flags once, then echo the flags
...
Creating the configure flags once avoids inconsistent flags
between configure and distcheck configure.
Echoing the flags helps developers work out what configure is
doing.
(Backported to 0.2.9 and later as a precaution.)
Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases.
2018-08-09 22:18:12 +10:00
Karsten Loesing
fe19b40fe9
Update geoip and geoip6 to the August 7 2018 database.
2018-08-09 09:44:38 +02:00
Taylor Yu
340da669be
Add more optional packages to Travis
...
Apparently we weren't building with either libcap or libseccomp on
Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes
ticket 26560.
2018-08-09 16:51:42 +10:00
Nick Mathewson
159141a8c6
Merge branch 'ticket26947'
2018-08-08 18:07:32 -04:00
Nick Mathewson
0f0dac0bfc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 18:06:15 -04:00
Nick Mathewson
da4f4cb269
Merge branch 'maint-0.3.4'
2018-08-08 18:06:15 -04:00
Nick Mathewson
c4d0d9bd24
Merge branch 'bug26948_033' into maint-0.3.3
2018-08-08 18:06:11 -04:00
Nick Mathewson
26f1167e71
Merge branch 'bug26779_033' into bug26779_035
2018-08-08 15:50:29 -04:00
Nick Mathewson
b66386865e
Detect broken stdatomic.h, and pretend that it isn't there at all
...
I hope that the debian clang maintainers will look at debian bug
903709 soon. But until they do, this should keep our users and our
CI happy on sid with clang.
Closes ticket 26779.
2018-08-08 15:49:39 -04:00
rl1987
5f2e00241a
Add changes file
2018-08-08 19:07:50 +03:00
Nick Mathewson
7a570b8182
Don't search for -lpthread on Windows
...
If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present. Fixes bug 27081; bugfix on 1790dc6760
2018-08-08 09:56:51 -04:00
Nick Mathewson
aaa5ca366e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 09:26:23 -04:00
Nick Mathewson
7787150521
Merge branch 'maint-0.3.4'
2018-08-08 09:26:23 -04:00
Nick Mathewson
00536254b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-08 09:26:23 -04:00
Nick Mathewson
8e68fe7e1c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-08 09:26:22 -04:00
Nick Mathewson
27a2a6cb9b
Changes file for 25440
2018-08-08 09:26:21 -04:00
Nick Mathewson
8410d3b0ad
These changes files are also merged in 0.3.4.6-rc: remove them.
2018-08-07 08:10:26 -04:00
Nick Mathewson
5e86a28683
Merge branch 'maint-0.3.4'
2018-08-07 08:05:56 -04:00
Nick Mathewson
882b2ad0aa
Merge branch 'bug27003_034_v2' into maint-0.3.4
2018-08-07 08:05:51 -04:00
Nick Mathewson
abf88af488
Merge branch 'maint-0.3.4'
2018-08-06 10:39:59 -04:00
Nick Mathewson
a54e94878a
Rename SEC identifier to BW_SEC in test_bwmgt.h
...
Apparently Solaris 10 defines SEC somewhere in its headers, causing
a compilation problem.
Fixes bug 26994; bugfix on 0.3.4.1-alpha.
2018-08-06 10:39:14 -04:00
Nick Mathewson
2584604664
Remove changes files for items already merged into 0.3.4.6-rc
2018-08-06 08:35:41 -04:00
Nick Mathewson
5597ddc360
Mark openbsd-malloc as deprecated
2018-08-03 07:38:47 -04:00
Nick Mathewson
bb1f294232
Merge branch 'with_malloc_squashed'
2018-08-03 07:35:23 -04:00
Nick Mathewson
abde9fb426
Add a --with-malloc option.
...
Based on a patch from Hello71 on ticket 20424.
This patch additionally fixes openbsd-malloc support, switches
our tcmalloc support to use pkgconfig, and tells the compiler to
omit system malloc implementations as appropriate.
squash! Add a --with-malloc option.
Edit changelog file to fix a typo and credit Alex Xu in preferred format.
2018-08-03 07:34:40 -04:00
Nick Mathewson
be8e56c231
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-03 07:33:45 -04:00
Nick Mathewson
2a6c1585b0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-03 07:33:45 -04:00
Nick Mathewson
4856a6e6c4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-03 07:33:45 -04:00
Nick Mathewson
ae157b79e7
Merge branch 'maint-0.3.4'
2018-08-03 07:33:45 -04:00
Nick Mathewson
42c6ebda16
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
2018-08-03 07:33:39 -04:00
Nick Mathewson
176999fd95
When enabling periodic events, schedule but don't run them immediately.
...
When we fixed 25939 in f7633c1fca#25761 ) prevented us from rescanning our periodic
events as appropriate, but when we fixed THAT one, this bug reared
its ugly head.
The fix here is that "enabling" an event should cause us to run it
from the event loop, but not immediately from the point where we
enable it.
Fixes bug 27003; bugfix on 0.3.4.1-alpha.
2018-08-02 10:14:56 -04:00
Nick Mathewson
820aba70ef
Changes file for owningcontrollerfd api
2018-08-01 11:09:15 -04:00
Nick Mathewson
fdaa483098
Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
2018-07-31 19:56:23 -04:00
Nick Mathewson
e7a0616817
Changes files for feature26815 and 26816
2018-07-31 19:46:00 -04:00
Nick Mathewson
772106c6bc
Add a new function, tor_api_get_provider_version()
...
Closes ticket 26947.
2018-07-31 09:18:54 -04:00
Nick Mathewson
7e4ac0283e
Merge remote-tracking branch 'teor/bug26986'
2018-07-31 08:50:38 -04:00
Nick Mathewson
a67d153cc7
Always call tor_free_all() when exiting tor_run_main()
...
We would usually call it through tor_cleanup(), but in some code
paths, we wouldn't. These paths would break restart-in-process,
since leaving fields uncleared would cause assertion failures on
restart.
Fixes bug 26948; bugfix on 0.3.3.1-alpha
2018-07-31 08:45:17 -04:00
Nick Mathewson
01c73711f1
Merge branch 'maint-0.3.4'
2018-07-31 08:30:58 -04:00
Nick Mathewson
bcce3e7e0b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-31 08:30:01 -04:00
Nick Mathewson
373b23a9ee
Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
2018-07-31 08:29:54 -04:00
Nick Mathewson
d66cfadbd3
Merge remote-tracking branch 'teor/bug26979'
2018-07-31 08:26:15 -04:00
Nick Mathewson
de4d7c3837
Merge branch 'ticket26447'
2018-07-31 08:21:10 -04:00
teor
fcc8480093
Appveyor CI: Changes file for 26979
...
Closes 26979.
2018-07-31 11:58:04 +10:00
teor
9118430b14
Use Windows-compatible format strings in tor-print-ed-signing-cert.c
...
Fixes bug 26986; bugfix on master.
2018-07-31 11:21:28 +10:00
Nick Mathewson
21babc8d3f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 09:01:59 -04:00
Nick Mathewson
3a6bd21440
Merge remote-tracking branch 'teor/bug26627_033_merged_master'
2018-07-30 09:01:55 -04:00
Nick Mathewson
4f854dbdc2
Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3
2018-07-30 09:01:45 -04:00
Nick Mathewson
ff593ae878
Merge remote-tracking branch 'rl1987/feature19506_3'
2018-07-30 08:55:57 -04:00
Nick Mathewson
13393b2d91
Merge remote-tracking branch 'rl1987/ticket21349_4'
2018-07-30 08:49:49 -04:00
Nick Mathewson
7d66ec0feb
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:45:01 -04:00
Nick Mathewson
a159eaf45f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:45:01 -04:00
Nick Mathewson
ec1ced3cc1
Merge remote-tracking branch 'teor/bug26924'
2018-07-30 08:44:58 -04:00
Nick Mathewson
fea35ddf00
Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
2018-07-30 08:44:40 -04:00
Nick Mathewson
ac9d08f66a
Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'
2018-07-30 08:33:59 -04:00
Nick Mathewson
811ed8cf9f
Merge remote-tracking branch 'rl1987/bug26892_take2'
2018-07-30 08:24:14 -04:00
Nick Mathewson
d102e9c2e4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:17:25 -04:00
Nick Mathewson
5823e62fa2
Merge branch 'maint-0.3.4'
2018-07-30 08:17:25 -04:00
Nick Mathewson
15d7f24c57
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:17:24 -04:00
Taylor Yu
a8bdb851eb
Don't disable an unsupported compiler warning
...
Conditionalize the pragma that temporarily disables
-Wunused-const-variable. Some versions of gcc don't support it. We
need to do this because of an apparent bug in some libzstd headers.
Fixes bug 26785; bugfix on 0.3.2.11.
2018-07-26 12:32:34 -05:00
rl1987
ffdfd39d4f
Early bailout from log_addr_has_changed() if running as client
2018-07-26 17:49:27 +03:00
teor
d01602bebb
Merge branch 'bug26924_032' into bug26924
...
Update rendcommon.h include path.
2018-07-25 14:50:45 +10:00
teor
859d5a7375
Improve connection auth logging
...
Improve the log message when connection initiators fail to authenticate
direct connections to relays.
Fixes bug 26927; bugfix on 0.3.0.1-alpha.
2018-07-25 14:39:31 +10:00
teor
fdc3ad6259
Merge branch 'bug26924_029' into bug26924_032
2018-07-25 14:33:10 +10:00
teor
6443812e34
Stop logging link auth warnings on Single Onion Services and Tor2web
...
Instead, log a protocol warning when single onion services or
Tor2web clients fail to authenticate direct connections to relays.
Fixes bug 26924; bugfix on 0.2.9.1-alpha.
2018-07-25 14:30:33 +10:00
teor
fc4d08e260
Merge branch 'bug26627_033' into bug26627_033_merged_master
2018-07-25 09:17:17 +10:00
teor
3821081a55
Stop putting unsupported ed25519 link auth in v3 onion service descs
...
Stop putting ed25519 link specifiers in v3 onion service descriptors,
when the intro point doesn't support ed25519 link authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:15 +10:00
teor
a99920c7d4
Stop sending unsupported ed25519 link specifiers in v3 introduce cells
...
Stop sending ed25519 link specifiers in v3 onion service introduce
cells, when the rendezvous point doesn't support ed25519 link
authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:04 +10:00
juga0
6d59ab16a0
Add changes file regarding bandwidth file headers
2018-07-23 00:58:31 +00:00
rl1987
e9f6f742b2
Add changes file
2018-07-21 18:38:33 +03:00
Neel Chauhan
7651518b6d
Add changes file for Bug #20874
2018-07-20 21:39:09 -04:00
rl1987
dddc9a1715
Add changes file
2018-07-20 21:42:45 +03:00
Nick Mathewson
977821e59f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-20 10:42:29 -04:00
Nick Mathewson
dbf57ecf39
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-20 10:42:29 -04:00
Nick Mathewson
583df33e20
Merge branch 'maint-0.3.4'
2018-07-20 10:42:29 -04:00
Nick Mathewson
be3a962ca7
Merge branch 'ticket26647_032' into maint-0.3.2
2018-07-20 10:42:23 -04:00
teor
022b8f15da
Ignore mach_approximate_time when targeting macOS 10.9 and earlier
...
Work around two different bugs in the OS X 10.10 and later SDKs that would
prevent us from successfully targeting earlier versions of OS X.
Fixes bug 26876; bugfix on 0.3.3.1-alpha.
2018-07-20 12:29:32 +10:00
Nick Mathewson
b44fce6716
Merge branch 'maint-0.3.4'
2018-07-19 08:32:00 -04:00
Nick Mathewson
0a60a94a55
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-19 08:31:07 -04:00
Nick Mathewson
27f5bd52fe
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-19 08:31:07 -04:00
Nick Mathewson
209332e71a
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
2018-07-19 08:30:59 -04:00
Nick Mathewson
e0f99404f5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:25 -04:00
Nick Mathewson
d5dd500e36
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 16:39:25 -04:00
Nick Mathewson
312a42fc85
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:25 -04:00
Nick Mathewson
64af15d373
Merge branch 'maint-0.3.4'
2018-07-18 16:39:25 -04:00
Nick Mathewson
93da2cae49
Changes file for bug 26787
2018-07-18 16:39:22 -04:00
Nick Mathewson
61e080e24a
Merge branch 'maint-0.3.4'
2018-07-18 15:09:28 -04:00
Nick Mathewson
a7bd20ebaf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 15:08:57 -04:00
Nick Mathewson
c31700d664
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 15:04:14 -04:00
Nick Mathewson
559f79fd79
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 15:03:27 -04:00
Nick Mathewson
a321d72401
Merge branch 'bug26485_029_squashed' into maint-0.2.9
2018-07-18 15:01:03 -04:00
