nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-11 05:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,020 Commits 53 Branches 631 Tags 130 MiB
db769b6407
Commit Graph

20020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rl1987
db769b6407 Fix ReleaseNotes so that entries about docs are in Documentation section. 2015-04-01 09:35:24 -04:00
Nick Mathewson
461a0de3ca Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-25 14:09:35 -04:00
Nick Mathewson
b117a06784 Bump to 0.2.6.6-dev 2015-03-25 14:09:23 -04:00
Nick Mathewson
bb8c4e69ca Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-24 10:23:44 -04:00
Nick Mathewson
dfd6cf9ea2 bump to 0.2.6.6 2015-03-24 10:23:34 -04:00
Nick Mathewson
5ebe7f2160 Pick a date for 0.2.6.6 2015-03-24 10:22:02 -04:00
Nick Mathewson
6ce1a82132 Start 0.2.6.6 changelog; fold in the one entry. 2015-03-24 09:37:36 -04:00
Nick Mathewson
3eff8f38a5 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 2015-03-24 09:34:39 -04:00
Nick Mathewson
97ca0257e1 Fold stuff into 0.2.6 releasenotes and add a blurb 2015-03-24 09:34:30 -04:00
Nick Mathewson
c113544a94 Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6 2015-03-23 09:25:15 -04:00
Yawning Angel
732f522a42 Fix unaligned access in SipHash-2-4. 
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-23 09:20:02 -04:00
Nick Mathewson
d8b2b1168e Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-18 16:32:26 -04:00
Nick Mathewson
ca03b10b0c bump to 0.2.6.5-rc.dev 2015-03-18 16:32:13 -04:00
Nick Mathewson
e0b77cd319 Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-18 09:10:55 -04:00
Nick Mathewson
77c671b7dd bump to 0.2.6.5-rc 2015-03-18 09:10:48 -04:00
Nick Mathewson
eea90546f6 0.2.6.5-rc will come out today, because why not. 2015-03-18 09:09:08 -04:00
Nick Mathewson
90a0a0ca7a Fold everything into changelog, remove already-folded-in changes 2015-03-18 09:07:52 -04:00
Nick Mathewson
bbf304be26 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 2015-03-18 09:06:21 -04:00
Nick Mathewson
91f7771fe5 Start work on 0.2.6.5-?? changelog 2015-03-17 10:58:12 -04:00
Nick Mathewson
bfde3cd6d1 Forward-port changelogs and releasenotes 2015-03-17 10:52:08 -04:00
Nick Mathewson
a0f892f190 Simplify the loop. 2015-03-14 14:31:26 -04:00
Nick Mathewson
ddb1889eb8 Add comments for new functions 2015-03-14 14:28:29 -04:00
Nick Mathewson
92d04721a2 remove a needless "if (1)" that was there for indentation; fix indentation. 2015-03-14 14:28:29 -04:00
Nick Mathewson
b78803f9f5 Extract main part of main loop into a separate function 
For 15176; Shadow would like this.

Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.
 2015-03-14 14:28:29 -04:00
Nick Mathewson
4619fd4a20 Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-12 13:24:37 -04:00
Nick Mathewson
eb68ea20f8 Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6 2015-03-12 13:15:08 -04:00
Yawning Angel
b3281fc6d6 Initialize the extorport auth cookie before launching PTs. 
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-12 13:12:56 -04:00
Nick Mathewson
c2dcd9b703 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 
("-s ours" merge to avoid taking reversion of #15064)
 2015-03-12 12:51:20 -04:00
Nick Mathewson
9063f29160 Revert "Make TransProxyType ipfw work correctly" 
This reverts commit 681802817d.

(I didn't mean to backport this, but somehow I had based my branch
for #15205 on it.)
 2015-03-12 12:49:08 -04:00
Nick Mathewson
8a060d8643 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-03-12 12:27:42 -04:00
Nick Mathewson
eecd410984 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 2015-03-12 12:27:25 -04:00
Nick Mathewson
7eb84e10e3 Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-12 12:11:03 -04:00
Nick Mathewson
1a1d431cff Merge branch 'bug15245_026' into maint-0.2.6 2015-03-12 11:37:02 -04:00
Nick Mathewson
d4c1716263 add an explanatory comment 2015-03-12 11:28:18 -04:00
Nick Mathewson
648af0438d Also, add an assertion to assign_onionskin_to_cpuworker 2015-03-12 11:15:50 -04:00
Nick Mathewson
66c8180207 Fix crash bug when calling cpuworkers_rotate_keyinfo on a client. 
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
 2015-03-12 11:14:39 -04:00
Nick Mathewson
354897a13e Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-03-12 10:54:13 -04:00
Nick Mathewson
a00d07ac1b Bump 025 version to 0.2.5.11 2015-03-12 10:52:09 -04:00
Nick Mathewson
b563082ad8 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-03-12 10:51:08 -04:00
Nick Mathewson
5f46a59ba3 Bump 0.2.4 version. 2015-03-12 10:50:15 -04:00
Nick Mathewson
a95e18b358 Merge branch 'bug9495_redux_v2' into maint-0.2.6 2015-03-12 10:05:06 -04:00
Nick Mathewson
192ed94410 Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash 
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-12 10:03:02 -04:00
Nick Mathewson
0f0b83815f Start on 0.2.6 release notes 
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-10 10:59:13 -04:00
Nick Mathewson
985687bc4f Fix check-spaces 2015-03-10 10:10:35 -04:00
Nick Mathewson
d29a8ad564 Add link protocol version counts to the heartbeat message 
Closes ticket 15212
 2015-03-10 10:07:41 -04:00
Nick Mathewson
2224780fc5 Whoops; I somehow dropped 9321 from the changelog 2015-03-10 08:39:20 -04:00
Nick Mathewson
74f861b295 Merge branch 'maint-0.2.6' into release-0.2.6 
Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h
 2015-03-10 08:21:53 -04:00
Nick Mathewson
99b59dee70 bump 0.2.6 to 0.2.6.4-rc-dev 2015-03-10 08:20:47 -04:00
Nick Mathewson
0c2e4aec7b Fold more into the 0.2.6.4-rc changelog 2015-03-09 19:52:10 -04:00
Nick Mathewson
ff1f6c417c Merge branch 'maint-0.2.6' into release-0.2.6 2015-03-09 19:47:28 -04:00