Nick Mathewson
a45526c230
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-05-19 14:49:54 -04:00
Nick Mathewson
b3a225fb13
Bump maint-0.2.6 to 0.2.6.8
2015-05-19 14:48:09 -04:00
Nick Mathewson
e1366d907a
Start a changelog for 0.2.6.8
2015-05-19 14:41:17 -04:00
Nick Mathewson
dad3522712
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
2015-05-13 11:05:50 -04:00
Nick Mathewson
614d9bc967
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-05-13 11:05:33 -04:00
Nick Mathewson
407441c652
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
2015-05-13 11:05:05 -04:00
Nick Mathewson
8aa04408fb
Merge branch 'bug15823_025' into maint-0.2.5
2015-05-13 11:03:05 -04:00
John Brooks
2b27ce52d2
Fix out-of-bounds read in INTRODUCE2 client auth
...
The length of auth_data from an INTRODUCE2 cell is checked when the
auth_type is recognized (1 or 2), but not for any other non-zero
auth_type. Later, auth_data is assumed to have at least
REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds
read.
Fixed by checking auth_len before comparing the descriptor cookie
against known clients.
Fixes #15823 ; bugfix on 0.2.1.6-alpha.
2015-05-05 15:05:32 -04:00
David Goulet
26c344a563
Revert "Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()"
...
Fixes #15850 , part of #15801 . Change file is added by this commit. The
original comment in the reverted commit is removed because right now we
*need* a DirPort until #15849 is implemented so no doubt nor confusion there
anymore.
This reverts commit 80bed1ac96
2015-04-28 14:30:07 -04:00
Nick Mathewson
0ac748353a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-27 14:18:16 -04:00
Nick Mathewson
6c7720ed49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-27 14:16:55 -04:00
Nick Mathewson
efae1bcef6
Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4
2015-04-27 14:15:58 -04:00
Nick Mathewson
609cdec112
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-04-27 14:15:44 -04:00
Karsten Loesing
b5f6495876
Update geoip6 to the April 8 2015 database.
2015-04-24 17:51:36 +02:00
Karsten Loesing
bcc0a48cfe
Update geoip to the April 8 2015 database.
2015-04-24 17:49:45 +02:00
Nick Mathewson
9ccf019b16
Merge branch 'maint-0.2.6' into release-0.2.6
2015-04-06 10:03:26 -04:00
Nick Mathewson
f620b8f032
bump version to 0.2.6.7-dev
2015-04-06 10:02:59 -04:00
Nick Mathewson
39c056e207
Merge branch 'maint-0.2.6' into release-0.2.6
2015-04-06 10:00:45 -04:00
Nick Mathewson
eb41214dba
bump version to 0.2.6.7
2015-04-06 10:00:30 -04:00
Nick Mathewson
eab67b06cf
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:59:06 -04:00
Nick Mathewson
c4e63b6705
releasenotes for 0.2.6.7
2015-04-06 09:58:39 -04:00
Nick Mathewson
3a5d4d666e
bump 0.2.5 version to 0.2.5.12
2015-04-06 09:56:37 -04:00
Nick Mathewson
5633261f2e
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:55:44 -04:00
Nick Mathewson
542100d3ca
Bump 0.2.4 version more places
2015-04-06 09:48:53 -04:00
Nick Mathewson
442d577af5
Bump 0.2.4 version
2015-04-06 09:41:59 -04:00
Nick Mathewson
8725e6c7bc
Fix another pseudonym to the most frequently used version
2015-04-06 09:41:05 -04:00
Nick Mathewson
ee774b0253
Tweak changelog.
2015-04-06 09:40:12 -04:00
Nick Mathewson
a5df309d89
ChangeLog for 0.2.6.7
2015-04-06 09:37:36 -04:00
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
