summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-24Merge branch 'maint-0.2.6' into release-0.2.6tor-0.2.6.6Nick Mathewson
2015-03-24bump to 0.2.6.6Nick Mathewson
2015-03-24Pick a date for 0.2.6.6Nick Mathewson
2015-03-24Start 0.2.6.6 changelog; fold in the one entry.Nick Mathewson
2015-03-24Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6Nick Mathewson
2015-03-24Fold stuff into 0.2.6 releasenotes and add a blurbNick Mathewson
2015-03-23Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6Nick Mathewson
2015-03-23Fix unaligned access in SipHash-2-4.Yawning Angel
The compiler is allowed to assume that a "uint64_t *" is aligned correctly, and will inline a version of memcpy that acts as such. Use "uint8_t *", so the compiler does the right thing.
2015-03-18Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-03-18bump to 0.2.6.5-rc.devNick Mathewson
2015-03-18Merge branch 'maint-0.2.6' into release-0.2.6tor-0.2.6.5-rcNick Mathewson
2015-03-18bump to 0.2.6.5-rcNick Mathewson
2015-03-180.2.6.5-rc will come out today, because why not.Nick Mathewson
2015-03-18Fold everything into changelog, remove already-folded-in changesNick Mathewson
2015-03-18Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6Nick Mathewson
2015-03-17Start work on 0.2.6.5-?? changelogNick Mathewson
2015-03-17Forward-port changelogs and releasenotesNick Mathewson
2015-03-14Simplify the loop.Nick Mathewson
2015-03-14Add comments for new functionsNick Mathewson
2015-03-14remove a needless "if (1)" that was there for indentation; fix indentation.Nick Mathewson
2015-03-14Extract main part of main loop into a separate functionNick Mathewson
For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.
2015-03-12Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-03-12Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6Nick Mathewson
2015-03-12Initialize the extorport auth cookie before launching PTs.Yawning Angel
PTs expect the auth cookie to be available immedieately after launch, leading to a race condition when PTs opt to cache the extorport cookie once immediately after startup. Fixes #15240.
2015-03-12Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
("-s ours" merge to avoid taking reversion of #15064)
2015-03-12Revert "Make TransProxyType ipfw work correctly"Nick Mathewson
This reverts commit 681802817deb6fb93b95f8284856fd42f3556600. (I didn't mean to backport this, but somehow I had based my branch for #15205 on it.)
2015-03-12Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-03-12Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5Nick Mathewson
2015-03-12Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-03-12Merge branch 'bug15245_026' into maint-0.2.6Nick Mathewson
2015-03-12add an explanatory commentNick Mathewson
2015-03-12Also, add an assertion to assign_onionskin_to_cpuworkerNick Mathewson
2015-03-12Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.Nick Mathewson
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
2015-03-12Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-03-12Bump 025 version to 0.2.5.11Nick Mathewson
2015-03-12Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-03-12Bump 0.2.4 version.Nick Mathewson
2015-03-12Merge branch 'bug9495_redux_v2' into maint-0.2.6Nick Mathewson
2015-03-12Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crashNick Mathewson
When calling pthread_attr_setdetachstate, we were using 1 as the argument. But the pthreads documentation says that you have to say PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40. Calling pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS. (Because we're so late in the release cycle, I made the code define PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to break any other platforms.) This bug was introduced when we made threading mandatory in 0.2.6.1-alpha; previously, we had force-disabled threading on Solaris. See #9495 discussion.
2015-03-10Start on 0.2.6 release notesNick Mathewson
I made these mostly mechanically, by collating all the 0.2.6.x changelogs and removing all the items that were bugfixes on 0.2.6.x.
2015-03-10Fix check-spacesNick Mathewson
2015-03-10Add link protocol version counts to the heartbeat messageNick Mathewson
Closes ticket 15212
2015-03-10Whoops; I somehow dropped 9321 from the changelogNick Mathewson
2015-03-10Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in src/win32/orconfig.h
2015-03-10bump 0.2.6 to 0.2.6.4-rc-devNick Mathewson
2015-03-09Fold more into the 0.2.6.4-rc changelogtor-0.2.6.4-rcNick Mathewson
2015-03-09Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson
2015-03-09Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6Nick Mathewson
2015-03-09Fix a couple of changelog issues noted by arma.Nick Mathewson
2015-03-09Merge branch 'maint-0.2.6' into release-0.2.6Nick Mathewson