summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-07Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-07Increase tolerances in util/monotonic_time testsNick Mathewson
This is an attempt to fix #19974.
2016-12-07Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-07Merge branch 'bug20710_025' into maint-0.2.9Nick Mathewson
2016-12-07Forgot to add changes file for 20710.Nick Mathewson
2016-12-05Fix a couple more crypto_digest() calls to be explicit < 0Nick Mathewson
2016-12-05whitespace fixNick Mathewson
2016-12-05Merge remote-tracking branch 'chelseakomlo/20717_hashing_api_bug'Nick Mathewson
2016-12-05Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2016-12-05Merge branch 'getentropy_028' into maint-0.2.8Nick Mathewson
2016-12-0520865: Don't use getentropy() on OSX Sierra.Nick Mathewson
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 1eba088054eca1555b455ee4a2adfafecb888af9 and 16fcbd21c963a9a65bf55024680c8323c8b7175d , 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-05Merge remote-tracking branch 'jryans/service_is_ephemeral'Nick Mathewson
2016-12-05Merge remote-tracking branch 'chelseakomlo/circuituse'Nick Mathewson
2016-12-05Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-05Test for .git as readable instead of a dir to support worktreesJ. Ryan Stinnett
Fixes #20492.
2016-12-05Merge remote-tracking branch 'jryans/local-hostname'Nick Mathewson
2016-12-05Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-05Fix changes file for 20864: 20638 _did_ get into 0.2.9Nick Mathewson
2016-12-05Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9Nick Mathewson
2016-12-05Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2016-12-05Always Use EVP_aes_*_ctr() with openssl 1.1Nick Mathewson
(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-04Use `rend_service_is_ephemeral` for all service checks in `rendservice.c`J. Ryan Stinnett
Fixes #20853.
2016-12-03Clarify that ClientRejectInternalAddresses also rejects mDNS *.local hostsJ. Ryan Stinnett
Fixes #17070.
2016-12-03Use a temporary service list when validating and adding hidden servicesteor
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-03Add a missing rend_service_free in rend_service_addteor
2016-12-03Clarify the function documentation for rend_get_service_list_mutableteor
Comment-only change
2016-12-03Changes file for 20864teor
2016-12-03Move a comment in test_single_onion_poisoningteor
2016-12-03Add a missing return value check in test_single_onion_poisoningteor
2016-12-03Remove a double-free in test_single_onion_poisoningteor
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-03Refactor poison_dir allocation and free in test_single_onion_poisoningteor
This pattern is much less error-prone when future changes are made.
2016-12-02Add accessor for inspecting timer callbacks.Nick Mathewson
2016-12-02Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-02protover: Fix old tor hardcoded version checkDavid Goulet
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-02Merge remote-tracking branch 'teor/bug20667'Nick Mathewson
2016-12-02Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-02Merge branch 'bug20716_026' into maint-0.2.9Nick Mathewson
2016-12-02Remove changes files got merged in 0.2.9.6-rc and earlierNick Mathewson
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-02Forward-port 0.2.8.10 to releasenotes and 0.2.8.10,0.2.9.6-rc to changelogNick Mathewson
2016-12-02Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-02Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2016-12-02Bump to 0.2.9.6-rc-devNick Mathewson
2016-12-02Bump to 0.2.8.10-devNick Mathewson
2016-12-02Merge branch 'bug20599_030_v4'Nick Mathewson
2016-12-02Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-02test_single_onion_poisoning: Free dir[12] on all pathsNick Mathewson
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-01Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-01Bump to 0.2.9.6-rcNick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion