summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-08Merge branch 'maint-0.2.8' into release-0.2.8tor-0.2.8.11Nick Mathewson
2016-12-08Merge remote-tracking branch 'origin/maint-0.2.8' into maint-0.2.8Nick Mathewson
2016-12-08Copy ChangeLog into ReleaseNotes; pick a date (today)Nick Mathewson
2016-12-08Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-12-08Bump to 0.2.8.11Nick Mathewson
2016-12-07Mention the 2nd part of 20865 in the changelogNick Mathewson
2016-12-07Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-12-07Actually include the changelog though.Nick Mathewson
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-07Start a changelog for 0.2.8.11Nick Mathewson
2016-12-05Merge branch 'maint-0.2.8' into release-0.2.8Nick 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 branch 'maint-0.2.8' into release-0.2.8Nick 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-02Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-12-02Bump to 0.2.8.10-devNick Mathewson
2016-12-02put the 0.2.8.10 changelog in the releasenotes tootor-0.2.8.10Roger Dingledine
2016-12-02fix typoRoger Dingledine
also reorder a stanza to put the more exciting bug first
2016-12-02Pick a release date.Nick Mathewson
2016-12-01Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-12-01Bump to 0.2.8.10Nick Mathewson
2016-12-01Start an 0.2.8.10 changelogNick Mathewson
All entries are copied verbatim from the 029 changelog.
2016-12-01Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-11-22Try to work around breakage in the OSX 10.12 SDK.Nick Mathewson
Apple is supposed to decorate their function declarations with macros to indicate which OSX version introduced them, so that you can tell the compiler that you want to build against certain versions of OSX. But they forgot to do that for clock_gettime() and getentropy(), both of which they introduced in 10.12. This patch adds a kludge to the configure.ac script where, if we detect that we are targeting OSX 10.11 or earlier, we don't even probe to see if the two offending functions are present. Closes ticket 20235.
2016-11-07Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-11-07Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-11-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-11-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-11-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-11-07Update geoip and geoip6 to the November 3 2016 database.Karsten Loesing
2016-11-03Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-11-03Merge branch 'bug20551_028' into maint-0.2.8Nick Mathewson
2016-11-03Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-11-03Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8Nick Mathewson
2016-11-03Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-11-03Work around a behavior change in openssl's BUF_MEM codeNick Mathewson
In our code to write public keys to a string, for some unfathomable reason since 253f0f160e1185c, we would allocate a memory BIO, then set the NOCLOSE flag on it, extract its memory buffer, and free it. Then a little while later we'd free the memory buffer with BUF_MEM_free(). As of openssl 1.1 this doesn't work any more, since there is now a BIO_BUF_MEM structure that wraps the BUF_MEM structure. This BIO_BUF_MEM doesn't get freed in our code. So, we had a memory leak! Is this an openssl bug? Maybe. But our code was already pretty silly. Why mess around with the NOCLOSE flag here when we can just keep the BIO object around until we don't need the buffer any more? Fixes bug 20553; bugfix on 0.0.2pre8
2016-11-03Use explicit casts to avoid warnings when building with openssl 1.1Nick Mathewson
fixes bug 20551; bugfix on 0.2.1.1-alpha
2016-11-01Always call connection_ap_attach_pending() once a second.Nick Mathewson
Fixes bug 19969; bugfix on b1d56fc58. We can fix this some more in later Tors, but for now, this is probably the simplest fix possible. This is a belt-and-suspenders fix, where the earlier fix ("Ask event_base_loop to finish when we add a pending stream") aims to respond to new streams as soon as they arrive, and this one aims to make sure that we definitely respond to all of the streams.
2016-11-01Ask event_base_loop to finish when we add a pending streamRoger Dingledine
Fixes bug 19969; bugfix on b1d56fc58. We can fix this some more in later Tors, but for now, this is probably the right fix for us.
2016-11-01refactor out the tor_event_base_loopexit() callRoger Dingledine
no actual changes
2016-10-17Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-10-17Bump to 0.2.8.9-devNick Mathewson
2016-10-17Changelog and releasenotes for 0.2.8.9tor-0.2.8.9Nick Mathewson
2016-10-17Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-10-17bump to 0.2.8.9Nick Mathewson
2016-10-17Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson
2016-10-17Merge branch 'buf_sentinel_026_v2' into maint-0.2.8Nick Mathewson
2016-10-17Add a one-word sentinel value of 0x0 at the end of each buf_t chunkNick Mathewson
This helps protect against bugs where any part of a buf_t's memory is passed to a function that expects a NUL-terminated input. It also closes TROVE-2016-10-001 (aka bug 20384).
2016-10-06Merge branch 'maint-0.2.8' into release-0.2.8Nick Mathewson