torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,822 Commits 53 Branches 631 Tags
a32646c2ed8a19e5061df4b57d0c27efe6bc357d
Commit Graph

32822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson a32646c2ed Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 18:58:44 -04:00
Nick Mathewson 50f981719f Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 18:58:44 -04:00
Nick Mathewson ef35435584 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-17 18:58:43 -04:00
Nick Mathewson dc41e6a80c Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 2019-09-17 18:58:06 -04:00
Nick Mathewson 2ebe1fcd52 Merge branch 'maint-0.2.9' into maint-0.3.5 
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
 2019-09-17 18:57:49 -04:00
Nick Mathewson c76907b54d Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 18:56:52 -04:00
Nick Mathewson cec42be570 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-17 18:56:52 -04:00
Nick Mathewson ece35992ac Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-17 18:55:18 -04:00
Nick Mathewson ab74c3560a Merge branch 'ticket31552_041' into maint-0.4.1 2019-09-17 18:54:05 -04:00
Nick Mathewson 34bab120df Ticket 31687: fix for tor_isinf() as well 
tor_isinf() was new in 0.4.0, and also needs to look at the
same rules as clamp_double_to_i64()
 2019-09-12 09:53:13 -04:00
Nick Mathewson 0327f9a075 Merge branch 'ticket31687_035' into ticket31687_040 2019-09-12 09:51:04 -04:00
Nick Mathewson 0891a31ad3 madvise: tolerate EINVAL and ENOSYS when minherit fails 
These errors can occur if we are built on a system with support for
madvise(MADV_NOFORK) but then we are run on a system whose kernel
does not support that flag.

If the error is something that we don't tolerate at all, we now log
it before crashing.

Fixes bug 31696.  I am calling this a bugfix on 0.4.1.1-alpha, where
we actually started using the map_anon code.

This is similar to, but not the same as, the fix for #31570.
 2019-09-11 09:13:50 -04:00
Nick Mathewson 97f7efa9e3 pf: when extracting an IPv6 address, make sure we got an IPv6 address 
Our code assumes that when we're configured to get IPv6 addresses
out of a TRANS_PF transparent proxy connection, we actually will.
But we didn't check that, and so FreeBSD started warning us about a
potential NULL pointer dereference.

Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was
added.
 2019-09-10 11:07:25 -04:00
Nick Mathewson 51475aee57 fp.c: Suppress float-conversion warnings on FreeBSD. 
We used to do this on Windows only, but it appears to affect
multiple platforms when building with certain versions of GCC, and a
common pattern for defining the floating-point classifier functions.

Fixes part of 31687. I'm calling this a bugfux on 31687, when we
started suppressing these warnings on Windows.
 2019-09-10 10:55:44 -04:00
David Goulet 409df19b5a build: The <sys/sysctl.h> is now deprecated on Linux 
Closes #31673
 2019-09-09 17:07:08 -04:00
David Goulet 484710f25b build: The <sys/sysctl.h> is now deprecated on Linux 
Closes #31673
 2019-09-09 17:05:23 -04:00
teor 6c3f339f05 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-05 14:48:05 +10:00
teor 4596ead2fc Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-05 14:48:02 +10:00
teor 896a1ac50b Merge branch 'maint-0.3.5' into maint-0.4.0 2019-09-05 14:47:54 +10:00
teor 0461837149 Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5 2019-09-05 14:47:34 +10:00
teor 215c3eef81 Merge branch 'maint-0.4.1' into release-0.4.1 
Resolved modified/deleted conflict on changes/bug30649 by deleting
the file.

tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of
changes/bug30649.
 2019-09-05 12:05:56 +10:00
teor 9dd908e713 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-09-05 12:05:12 +10:00
teor c08d3e46ca Merge commit '73890a86ef' into maint-0.4.1 
tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
    the fixup, because fixups break our push rules.

This is an "ours" merge, except for the bugfix version change in
changes/bug30649.
 2019-09-05 12:04:27 +10:00
teor 40797bd361 Merge remote-tracking branch 'tor-github/pr/1282' into release-0.4.1 2019-09-05 11:57:19 +10:00
George Kadianakis 73890a86ef Merge branch 'bug30649_040' into bug30649_maint_041 2019-09-05 11:48:03 +10:00
George Kadianakis 61082c059c Fix bugfix version in Bug 30649: Changes file. 2019-09-05 11:46:25 +10:00
teor 1203e137be Merge commit '763fd0ad66' into maint-0.4.0 
tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
 2019-09-05 11:42:26 +10:00
George Kadianakis 763fd0ad66 Fix bugfix version in Bug 30649: Changes file. 2019-09-05 11:41:45 +10:00
David Goulet 51103450e4 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-04 08:33:27 -04:00
David Goulet 630bb113a0 Merge branch 'tor-github/pr/1271' into maint-0.4.1 2019-09-04 08:33:10 -04:00
George Kadianakis 232202cc43 Add #30649 to ReleaseNotes. 2019-09-03 17:07:50 +03:00
Nick Mathewson d6f3e22519 Merge branch 'maint-0.4.1' into release-0.4.1 2019-09-02 14:11:32 -04:00
Nick Mathewson e3a458e441 Merge branch 'ticket12399_035' into maint-0.4.1 2019-09-02 14:11:18 -04:00
rl1987 05fa1689eb Change loglevel of message 'Hash of session info was not as expected' 2019-09-02 14:09:39 -04:00
George Kadianakis 262d97deb4 Fix #30649 changelog entry. 2019-09-02 11:46:22 +03:00
teor 6bb876ccd3 Merge branch 'maint-0.4.1' into release-0.4.1 2019-08-30 23:33:14 +10:00
teor 25e7fc5b7a Merge branch 'maint-0.4.0' into maint-0.4.1 2019-08-30 23:33:10 +10:00
teor a52a5e0099 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-08-30 23:33:01 +10:00
teor 1132dc9f75 Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5 2019-08-30 23:24:05 +10:00
teor b66712d85b Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5 2019-08-30 23:22:18 +10:00
teor 4662cbec7b Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5 2019-08-30 23:20:59 +10:00
Nick Mathewson fb0e8966f0 Stub more functions in dirvote headers to fix more of 31552. 2019-08-29 11:18:42 -04:00
Nick Mathewson 4256ee0d37 Stub out some more functions in dirvote/*.h, fix compilation. 
This fixes LTO compilation for Android and -O0 compilation in
general, when --disable-module-dirauth is provided.

Fixes bug 31552; bugfix on 0.4.1.1-alpha.
 2019-08-29 09:50:38 -04:00
David Goulet 7b60368ccf Merge branch 'maint-0.4.1' into release-0.4.1 2019-08-29 08:55:58 -04:00
David Goulet ff905f8e1e Merge branch 'tor-github/pr/1256' into maint-0.4.1 2019-08-29 08:55:31 -04:00
David Goulet 337b733cfc Merge branch 'tor-github/pr/1255' into maint-0.4.1 2019-08-29 08:55:27 -04:00
teor 664d1b4366 test: Change "make test-stem" so it only runs the stem tests that use tor 
This change makes test-stem faster and more reliable.

Use "make test-stem-full" to run all of stem's tests.

Closes ticket 31554.
 2019-08-29 21:56:16 +10:00
George Kadianakis 357e9a6f2c Merge branch 'maint-0.3.5' into maint-0.4.0 2019-08-27 11:49:36 +03:00
George Kadianakis 561134610f Merge branch 'maint-0.4.1' into release-0.4.1 2019-08-27 11:49:36 +03:00
George Kadianakis 5a73f369db Merge branch 'maint-0.4.0' into maint-0.4.1 2019-08-27 11:49:36 +03:00