 Sebastian Hahn
|
447769dd28
Don't init control authchallenge nonce as assert side effect
|
9 gadi atpakaļ |
|
Sebastian Hahn
|
68e9f364a0
don't init threads as side effect of assertion
|
9 gadi atpakaļ |
 Nick Mathewson
|
b683b9af00
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
1a1d431cff
Merge branch 'bug15245_026' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
d4c1716263
add an explanatory comment
|
9 gadi atpakaļ |
|
Nick Mathewson
|
648af0438d
Also, add an assertion to assign_onionskin_to_cpuworker
|
9 gadi atpakaļ |
|
Nick Mathewson
|
66c8180207
Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
|
9 gadi atpakaļ |
|
Nick Mathewson
|
a46f4982c2
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
354897a13e
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
a00d07ac1b
Bump 025 version to 0.2.5.11
|
9 gadi atpakaļ |
|
Nick Mathewson
|
b563082ad8
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
5f46a59ba3
Bump 0.2.4 version.
|
9 gadi atpakaļ |
|
Nick Mathewson
|
2bfdfc849b
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
a95e18b358
Merge branch 'bug9495_redux_v2' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
192ed94410
Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash
|
9 gadi atpakaļ |
|
Nick Mathewson
|
189f357f97
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
985687bc4f
Fix check-spaces
|
9 gadi atpakaļ |
|
Nick Mathewson
|
28b4ab784d
Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc
|
9 gadi atpakaļ |
|
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.
|
9 gadi atpakaļ |
|
Nick Mathewson
|
87993072ee
forward-port the 0.2.6.4-0rc changelog
|
9 gadi atpakaļ |
|
Nick Mathewson
|
86d4704483
Whoops; I somehow dropped 9321 from the changelog
|
9 gadi atpakaļ |
|
Nick Mathewson
|
bc6dcac353
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
e732ec295d
Merge commit 'origin/maint-0.2.6^'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
99b59dee70
bump 0.2.6 to 0.2.6.4-rc-dev
|
9 gadi atpakaļ |
|
Nick Mathewson
|
1af67d7f72
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
59f4c41087
Merge remote-tracking branch 'origin/maint-0.2.6'
|
9 gadi atpakaļ |
|
Nick Mathewson
|
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
|
9 gadi atpakaļ |
|
Nick Mathewson
|
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
|
9 gadi atpakaļ |
|
Nick Mathewson
|
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
|
9 gadi atpakaļ |
|
Nick Mathewson
|
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
|
9 gadi atpakaļ |
