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
23,429 Commits 53 Branches 631 Tags
1ba52d044dc4418fefe29ac205bbb7cac94e2df6
Commit Graph

23429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 1ba52d044d Merge branch 'maint-0.2.9' 2016-12-08 09:06:49 -05:00
Nick Mathewson 5d4ff915cb Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-08 09:06:10 -05:00
Nick Mathewson 4732e150e8 Bump to 0.2.8.11 2016-12-08 09:04:37 -05:00
Nick Mathewson 85538498b6 Merge branch 'maint-0.2.9' 2016-12-08 07:49:56 -05:00
cypherpunks 9fe6ffa588 Use the correct preprocessor macro for Linux 
Also combine all of the checks into one if-tree as only one of them
should actually succeed.
 2016-12-08 07:48:19 -05:00
Nick Mathewson d838a812bd Merge branch 'bug19960_2' into maint-0.2.9 2016-12-08 07:48:14 -05:00
Nick Mathewson 7fea2c3188 Merge branch 'maint-0.2.9' 2016-12-07 18:28:48 -05:00
Nick Mathewson f602172dba Merge branch 'maint-0.2.8' into maint-0.2.9 
(ours merge, to avoid taking 20865 fix)
 2016-12-07 18:28:09 -05:00
Nick Mathewson 10baf2c684 Backport the other sierra fix in 20865. 
They added clock_gettime(), but with tv_nsec as a long, whereas
tv_usec is a __darwin_suseconds_t (a.k.a. 'int').  Now, why would
they do that? Are they preparing for a world where there are more
than 2 billion nanoseconds per second?  Are they planning for having
int be less than 32 bits again?  Or are they just not paying
attention to the Darwin API?

Also, they forgot to mark clock_gettime() as Sierra-only, so even
if we fixed the issue here, we'd still be stick with portability
breakage like we were for 0.2.9.

So, just disable clock_gettime() on apple.
 2016-12-07 18:24:28 -05:00
Nick Mathewson b658893590 Merge branch 'bug19960_2' 2016-12-07 15:23:14 -05:00
Nick Mathewson 53d4e89626 Netbsd doesn't have ipfw, only the regular pf transport stuff. 
Attempted fix for 19960.

Also, fixes a typo.
 2016-12-07 15:22:44 -05:00
Nick Mathewson ab013719e5 Merge branch 'maint-0.2.9' 2016-12-07 11:26:02 -05:00
Nick Mathewson e7ade23f97 Increase verbosity on options/validate__transproxy 
This is an attempt to figure out what's up with #19960
 2016-12-07 11:24:58 -05:00
Nick Mathewson 1d45438ef0 Capture warning in dir/purpose_needs_anonymity_returns_true_by_default 2016-12-07 11:19:49 -05:00
Nick Mathewson 2499ea359a Merge branch 'maint-0.2.9' 2016-12-07 11:14:56 -05:00
Nick Mathewson 0815f96416 Fix a BUG() warning from next_random_exponential_delay(). 
Fixes 20875; this code is as suggested by teor on the ticket.  Thanks!
 2016-12-07 11:13:11 -05:00
Nick Mathewson b0a842913a Merge branch 'maint-0.2.9' 2016-12-07 11:09:27 -05:00
Nick Mathewson fce425e3ff Increase tolerances in util/monotonic_time tests 
This is an attempt to fix #19974.
 2016-12-07 11:08:54 -05:00
Nick Mathewson 129cee1c75 Merge branch 'maint-0.2.9' 2016-12-07 10:52:28 -05:00
Nick Mathewson d6ca36defa Merge branch 'bug20710_025' into maint-0.2.9 2016-12-07 10:52:12 -05:00
Nick Mathewson 045a50e45a Forgot to add changes file for 20710. 2016-12-07 10:51:39 -05:00
Nick Mathewson 41adfd6fa3 Fix a couple more crypto_digest() calls to be explicit < 0 2016-12-05 10:31:31 -05:00
Nick Mathewson daeb633825 whitespace fix 2016-12-05 10:31:10 -05:00
Nick Mathewson f92630941a Merge remote-tracking branch 'chelseakomlo/20717_hashing_api_bug' 2016-12-05 10:27:16 -05:00
Nick Mathewson 3f295bbef1 Merge branch 'maint-0.2.9' 2016-12-05 10:07:09 -05:00
Nick Mathewson 30f05167f1 Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-05 10:06:45 -05:00
Nick Mathewson cc34ba1cec Merge branch 'getentropy_028' into maint-0.2.8 2016-12-05 10:06:16 -05:00
Nick Mathewson 714aeedc52 20865: Don't use getentropy() on OSX Sierra. 
Tor 0.2.9 has a broader range of fixes and workarounds here, but for
0.2.8, we're just going to maintain the existing behavior.

(The alternative would be to backport both
1eba088054 and
16fcbd21c9 , but the latter is kind of
a subtle kludge in the configure.ac script, and I'm not a fan of
backporting that kind of thing.)
 2016-12-05 10:02:33 -05:00
Nick Mathewson 5923418eff Merge remote-tracking branch 'jryans/service_is_ephemeral' 2016-12-05 08:57:00 -05:00
Nick Mathewson f96f4c0e42 Merge remote-tracking branch 'chelseakomlo/circuituse' 2016-12-05 08:25:22 -05:00
Nick Mathewson 0ded72322c Merge branch 'maint-0.2.9' 2016-12-05 08:21:46 -05:00
J. Ryan Stinnett cf2f36b8b4 Test for .git as readable instead of a dir to support worktrees 
Fixes #20492.
 2016-12-05 08:21:17 -05:00
Nick Mathewson 8230cf7ea6 Merge remote-tracking branch 'jryans/local-hostname' 2016-12-05 08:17:01 -05:00
Nick Mathewson f7e8bd640a Merge branch 'maint-0.2.9' 2016-12-05 08:13:14 -05:00
Nick Mathewson 42ec60ecfb Fix changes file for 20864: 20638 _did_ get into 0.2.9 2016-12-05 08:12:10 -05:00
Nick Mathewson a23c581d13 Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9 2016-12-05 08:10:48 -05:00
Nick Mathewson 6eb1b4bd9c Merge branch 'maint-0.2.9' 2016-12-05 08:06:36 -05:00
Nick Mathewson 0d0c7a1164 Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-05 08:05:37 -05:00
Nick Mathewson 2a365413eb Always Use EVP_aes_*_ctr() with openssl 1.1 
(OpenSSL 1.1 makes EVP_CIPHER_CTX opaque, _and_ adds acceleration
for counter mode on more architectures.  So it won't work if we try
the older approach, and it might help if we try the newer one.)

Fixes bug 20588.
 2016-12-05 07:54:22 -05:00
J. Ryan Stinnett 63d3ba96f9 Use rend_service_is_ephemeral for all service checks in rendservice.c 
Fixes #20853.
 2016-12-04 14:35:09 -06:00
J. Ryan Stinnett 7ffa95abd9 Clarify that ClientRejectInternalAddresses also rejects mDNS *.local hosts 
Fixes #17070.
 2016-12-03 21:10:40 -06:00
teor 8a0ea3ee43 Use a temporary service list when validating and adding hidden services 
This resolves two issues:
* the checks in rend_add_services were only being performed when adding
  the service, and not when the service was validated,
  (this meant that duplicate checks were not being performed, and some SETCONF
  commands appeared to succeed when they actually failed), and
* if one service failed while services were being added, then the service
  list would be left in an inconsistent state (tor dies when this happens,
  but the code is cleaner now).

Fixes #20860.
 2016-12-03 09:10:46 +11:00
teor 93c62f5ac1 Add a missing rend_service_free in rend_service_add 2016-12-03 08:24:47 +11:00
teor 0446188674 Clarify the function documentation for rend_get_service_list_mutable 
Comment-only change
 2016-12-03 08:23:01 +11:00
teor ebf243bc5b Changes file for 20864 2016-12-03 06:35:45 +11:00
teor e8ce57e6e8 Move a comment in test_single_onion_poisoning 2016-12-03 06:30:58 +11:00
teor 8d42aab3f6 Add a missing return value check in test_single_onion_poisoning 2016-12-03 06:30:06 +11:00
teor fdd368d656 Remove a double-free in test_single_onion_poisoning 
We were freeing both dir{1,2} directly, and service_{1,2}->directory via
rend_service_free, even though they are the same pointer.
 2016-12-03 06:27:32 +11:00
teor c100c5c69b Refactor poison_dir allocation and free in test_single_onion_poisoning 
This pattern is much less error-prone when future changes are made.
 2016-12-03 06:25:46 +11:00
Nick Mathewson e6facbfe7a Add accessor for inspecting timer callbacks. 2016-12-02 12:15:07 -05:00