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
25,676 Commits 53 Branches 631 Tags
40887b4d2ec2e1865df8f381aa1387ba4ee10eba
Commit Graph
25676 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 045a50e45a Forgot to add changes file for 20710. 2016-12-07 10:51:39 -05:00
J. Ryan Stinnett 9b2b799d82 Accept non-space whitespace characters in log severity syntax. 
Adds a test_config_parse_log_severity unit test to verify behavior.

Fixes #19965.
 2016-12-06 11:11:43 -10: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 810f7c545b Clean up formatting of tor.1 man page and HTML doc 
Fixes #20885.
 2016-12-04 10:00:07 -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
Nick Mathewson ca4a0ae0b1 Merge branch 'maint-0.2.9' 2016-12-02 12:10:39 -05:00
David Goulet 907cd8a0cf protover: Fix old tor hardcoded version check 
When computing old Tor protocol line version in protover, we were looking at
0.2.7.5 twice instead of the specific case for 0.2.9.1-alpha.

Fixes #20810

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2016-12-02 12:09:08 -05:00
Nick Mathewson ed4213fa08 Merge remote-tracking branch 'teor/bug20667' 2016-12-02 12:07:10 -05:00
Nick Mathewson d7ec1708b1 Merge branch 'maint-0.2.9' 2016-12-02 12:00:53 -05:00
Nick Mathewson 8b93cbc16d Merge branch 'bug20716_026' into maint-0.2.9 2016-12-02 12:00:46 -05:00
Nick Mathewson 0ef5b8de74 Remove changes files got merged in 0.2.9.6-rc and earlier 
These won't appear in the 0.3.0.1-alpha changelog, so we don't want
to keep them around here.

List generated with ./scripts/maint/findMergedChanges.pl
 2016-12-02 11:26:41 -05:00
Nick Mathewson 1e8fa9e018 Forward-port 0.2.8.10 to releasenotes and 0.2.8.10,0.2.9.6-rc to changelog 2016-12-02 11:23:37 -05:00
Nick Mathewson fd51d06b90 Merge branch 'maint-0.2.9' 2016-12-02 11:20:57 -05:00
Nick Mathewson 70d39859d6 Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-02 11:20:27 -05:00
Nick Mathewson cf762c663d Bump to 0.2.9.6-rc-dev 2016-12-02 11:20:23 -05:00
Nick Mathewson 1122137fa0 Bump to 0.2.8.10-dev 2016-12-02 11:19:53 -05:00
Nick Mathewson e317a9cb7c Merge branch 'bug20599_030_v4' 2016-12-02 07:47:32 -05:00
Nick Mathewson 6f101f96a6 Merge branch 'maint-0.2.9' 2016-12-02 07:40:53 -05:00
Nick Mathewson 1221c5aa02 test_single_onion_poisoning: Free dir[12] on all paths 
Coverity doesn't like it when there are paths to the end of the
function where something doesn't get freed, even when those paths
are only reachable on unit test failure.

Fixes CID 1372899 and CID 1372900. Bug not in any released Tor.
 2016-12-02 07:39:14 -05:00
Nick Mathewson 647dbf65fd Merge branch 'maint-0.2.9' 2016-12-01 13:37:03 -05:00
Nick Mathewson 9e297f8197 Bump to 0.2.9.6-rc 2016-12-01 13:36:38 -05:00
Nick Mathewson bb0d668677 Merge branch 'maint-0.2.9' 2016-12-01 13:36:06 -05:00
Nick Mathewson 82bd2af78d Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-01 13:35:34 -05:00