Nick Mathewson
164c8349fb
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
2015-04-06 09:30:54 -04:00
Nick Mathewson
0475552140
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:26:16 -04:00
Nick Mathewson
fe69a7e1d7
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:25:37 -04:00
Nick Mathewson
7451b4cafe
Changes file for bug15601
2015-04-06 09:24:16 -04:00
Yawning Angel
dc3cb00080
Handle empty/zero length encoded intro points more gracefully.
...
In theory these should never the triggered as the only caller now
validates the parameters before this routine gets called.
2015-04-06 09:21:43 -04:00
Yawning Angel
7b5f558da4
Treat empty introduction points sections as missing.
...
Found by DonnchaC.
2015-04-06 09:20:46 -04:00
Yawning Angel
49ddd92c11
Validate the RSA key size received when parsing INTRODUCE2 cells.
...
Fixes bug 15600; reported by skruffy
2015-04-06 09:18:17 -04:00
Nick Mathewson
b3f24b5de3
Merge branch 'maint-0.2.6' into release-0.2.6
2015-04-03 09:52:57 -04:00
George Kadianakis
929a8f199b
Decrease the amount of rend circ relaunches for hidden services.
2015-04-03 09:47:40 -04:00
Nick Mathewson
c1b36488e9
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-03 09:39:19 -04:00
Nick Mathewson
3781955f07
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-03 09:38:54 -04:00
Nick Mathewson
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
George Kadianakis
bcb839387e
... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
...
(Sending a nak would be pointless.)
See ticket 15515 for discussion.
2015-04-03 09:36:05 -04:00
George Kadianakis
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
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#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
