Nick Mathewson
689562ab48
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 12:27:54 -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
b683b9af00
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 11:37:56 -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
a46f4982c2
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 10:54:30 -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
2bfdfc849b
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-12 10:06:10 -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
189f357f97
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-10 10:10:44 -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
28b4ab784d
Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc
2015-03-10 08:46:21 -04:00
Nick Mathewson
bd00c152bb
Remove the changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc or earlier.
2015-03-10 08:45:26 -04:00
Nick Mathewson
87993072ee
forward-port the 0.2.6.4-0rc changelog
2015-03-10 08:40:13 -04:00
Nick Mathewson
86d4704483
Whoops; I somehow dropped 9321 from the changelog
2015-03-10 08:39:37 -04:00
Nick Mathewson
bc6dcac353
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-10 08:37:08 -04:00
Nick Mathewson
e732ec295d
Merge commit 'origin/maint-0.2.6^'
2015-03-10 08:36: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
1af67d7f72
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
2015-03-09 19:47:12 -04:00
Nick Mathewson
59f4c41087
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 16:25:41 -04:00
Nick Mathewson
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 16:25:11 -04:00
Nick Mathewson
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-03-09 16:24:44 -04:00
Nick Mathewson
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
2015-03-09 16:24:07 -04:00
Nick Mathewson
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 16:23:55 -04:00
Karsten Loesing
62714068d9
Update geoip6 to the March 3 2015 database.
2015-03-09 21:11:52 +01:00
Karsten Loesing
beda8d2934
Update geoip to the March 3 2015 database.
2015-03-09 21:09:44 +01:00
Nick Mathewson
24c031b1a2
Don't use checked strl{cat,cpy} on OSX.
...
There is a bug in the overlap-checking in strlcat that can crash Tor
servers. Fixes bug 15205; this is an OSX bug, not a Tor bug.
2015-03-09 15:09:49 -04:00
Nick Mathewson
e3b6373003
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 13:50:05 -04:00
Nick Mathewson
c066f2d30b
We actually merged this one a while ago.
2015-03-09 13:49:55 -04:00
Nick Mathewson
4af742fe97
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 13:24:26 -04:00
Nick Mathewson
5c08a19eda
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 13:23:32 -04:00
Nick Mathewson
64bfc2930a
Restore c89 in 0.2.5
2015-03-09 13:22:58 -04:00
Nick Mathewson
8450f6e9a0
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 13:21:20 -04:00
Nick Mathewson
448bd22092
Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
2015-03-09 13:17:20 -04:00
Nick Mathewson
62631904cb
GETINFO bw-event-cache to get information on recent BW events
...
Closes 14128; useful to regain functionality lost because of 13988.
2015-03-09 13:13:56 -04:00
Nick Mathewson
e3408248b9
Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
2015-03-09 13:12:54 -04:00
Nick Mathewson
410ce4cb49
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
2015-03-09 13:09:50 -04:00
Nick Mathewson
ed7f2482e2
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 13:08:20 -04:00
Nick Mathewson
fb0de57ba2
Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
2015-03-09 13:05:27 -04:00
Nick Mathewson
0ec135b696
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-09 11:14:03 -04:00
Nick Mathewson
42d877f084
Changes file for 15188
2015-03-09 11:13:57 -04:00
Tom van der Woerdt
d39ede7f20
testing_common.c: avoid side-effects of tor_assert
2015-03-09 11:10:58 -04:00
