0e2f18868c
Merge branch 'maint-0.2.4' into release-0.2.4
2016-07-05 13:51:28 -04:00
6b8c3d2bc0
whoops. changelog file for 19271.
2016-07-05 13:51:21 -04:00
fd6ba23f7b
Merge branch 'maint-0.2.4' into release-0.2.4
2016-07-05 12:25:03 -04:00
c14c662758
Update geoip and geoip6 to the June 7 2016 database.
2016-06-12 11:35:50 +02:00
ef996c91b8
Merge branch 'maint-0.2.4' into release-0.2.4
2016-05-09 14:55:14 -04:00
3c2d4611ce
Update geoip and geoip6 to the May 4 2016 database.
2016-05-09 17:51:15 +02:00
8e6174e389
Merge branch 'maint-0.2.4' into release-0.2.4
2016-04-07 10:46:22 -04:00
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
8e2640b15a
Update geoip and geoip6 to the March 3 2016 database.
2016-03-04 10:56:51 +01:00
ad95d64fec
Merge branch 'bug18162_024' into maint-0.2.4
2016-02-11 12:55:25 -05:00
d5ac79e056
Update geoip and geoip6 to the February 2 2016 database.
2016-02-04 08:53:24 +01:00
bca7083e82
avoid integer overflow in and around smartlist_ensure_capacity.
...
This closes bug 18162; bugfix on a45b131590#18162 issues, this fixes a signed integer overflow
in smarltist_add_all(), which is probably not so great either.
2016-01-27 12:32:41 -05:00
7bb4422a93
Merge branch 'maint-0.2.4' into release-0.2.4
2016-01-07 09:47:36 -08:00
11f63d26ac
Update dannenberg's V3 authority identity fingerprint
...
This new identity key was changed on 18 November 2015.
2016-01-07 09:39:04 -08:00
1496056c12
Update geoip and geoip6 to the January 5 2016 database.
2016-01-07 11:10:37 +01:00
5138f5ca69
Ensure node is a guard candidate when picking a directory guard
2015-12-08 09:49:01 -05:00
b0867fec96
Fix a compilation warning introduced by clang 3.6
...
There was a dead check when we made sure that an array member of a
struct was non-NULL. Tor has been doing this check since at least
0.2.3, maybe earlier.
Fixes bug 17781.
2015-12-08 09:37:05 -05:00
dbb919cf94
Update geoip and geoip6 to the December 1 2015 database.
2015-12-05 17:02:59 +01:00
62b02a1941
Update geoip and geoip6 to the October 9 2015 database.
2015-10-09 15:27:55 +02:00
8b3e0b7729
Update geoip and geoip6 to the September 3 2015 database.
2015-09-24 15:08:15 +02:00
7004d67430
Update geoip and geoip6 to the July 8 2015 database.
2015-07-29 15:49:04 +02:00
fde4199e1c
Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
2015-06-25 11:42:47 -04:00
cb8c5c023f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-06-25 11:42:31 -04:00
08e14e1448
Update geoip6 to the June 3 2015 database.
2015-06-09 16:28:48 +02:00
e5907e94c2
Update geoip to the June 3 2015 database.
2015-06-09 16:26:10 +02:00
efae1bcef6
Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4
2015-04-27 14:15:58 -04:00
609cdec112
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-04-27 14:15:44 -04:00
a378b22394
Merge remote-tracking branch 'karsten/geoip6-apr2015' into release-0.2.4
2015-04-27 14:13:06 -04:00
55492e7d5a
Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.4
2015-04-27 14:08:46 -04:00
b5f6495876
Update geoip6 to the April 8 2015 database.
2015-04-24 17:51:36 +02:00
bcc0a48cfe
Update geoip to the April 8 2015 database.
2015-04-24 17:49:45 +02:00
da8505205d
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
2015-04-06 09:31:30 -04:00
7451b4cafe
Changes file for bug15601
2015-04-06 09:24:16 -04:00
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
44b48a9b67
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
2015-04-03 09:52:01 -04:00
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
9e44ed47ac
fold more entries into 0.2.4 changelog
2015-03-12 10:47:12 -04:00
5ba8ab5a88
Merge branch 'maint-0.2.4' into release-0.2.4
2015-03-09 16:24:20 -04:00
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
2015-03-09 16:24:07 -04:00
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 16:23:55 -04:00
62714068d9
Update geoip6 to the March 3 2015 database.
2015-03-09 21:11:52 +01:00
beda8d2934
Update geoip to the March 3 2015 database.
2015-03-09 21:09:44 +01:00
ef5f2b3606
Copy entries for an 0.2.4.26 changelog
2015-03-09 15:46:05 -04:00
b70a0a01ec
Merge branch 'maint-0.2.4' into release-0.2.4
2015-03-09 13:37:22 -04:00
6704e18dd2
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 11:08:57 -04:00
addffcc14d
Adjust changes header
2015-03-09 11:07:50 -04:00
81a994ce77
Make the assert related to 15083 a tiny bit more tolerant
2015-03-03 22:25:26 +01:00
71ee53fe9b
Do not leave empty, invalid chunks in buffers during buf_pullup
...
This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha.
Patch from 'cypherpunks'
2015-03-03 22:21:41 +01:00
dc06c071a4
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
2015-02-24 13:27:15 -05:00
Nick Mathewson
Karsten Loesing
teor (Tim Wilson-Brown)
Arlo Breault
Yawning Angel
George Kadianakis