summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-08Forward-port 0.2.8.11 notes (master)Nick Mathewson
2016-12-08Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
"Ours" merge to avoid bumping version.
2016-12-08Bump to 0.2.8.11-devNick Mathewson
2016-12-08Merge remote-tracking branch 'origin/maint-0.2.8' into maint-0.2.8Nick Mathewson
2016-12-08Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2016-12-08Bump to 0.2.8.11Nick Mathewson
2016-12-08Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-08Use the correct preprocessor macro for Linuxcypherpunks
Also combine all of the checks into one if-tree as only one of them should actually succeed.
2016-12-08Merge branch 'bug19960_2' into maint-0.2.9Nick Mathewson
2016-12-07Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-07Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
(ours merge, to avoid taking 20865 fix)
2016-12-07Backport the other sierra fix in 20865.Nick Mathewson
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-07Merge branch 'bug19960_2'Nick Mathewson
2016-12-07Netbsd doesn't have ipfw, only the regular pf transport stuff.Nick Mathewson
Attempted fix for 19960. Also, fixes a typo.
2016-12-07Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-07Increase verbosity on options/validate__transproxyNick Mathewson
This is an attempt to figure out what's up with #19960
2016-12-07Capture warning in dir/purpose_needs_anonymity_returns_true_by_defaultNick Mathewson
2016-12-07Merge branch 'maint-0.2.9'Nick Mathewson
2016-12-07Fix a BUG() warning from next_random_exponential_delay().Nick Mathewson
Fixes 20875; this code is as suggested by teor on the ticket. Thanks!
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