Commit Graph

23707 Commits

Author SHA1 Message Date
Nick Mathewson 4b6ba09674 Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-05 11:04:59 -04:00
Nick Mathewson 43ebe54a24 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-05 11:04:59 -04:00
Nick Mathewson 91c17ffbd6 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-05 11:04:59 -04:00
Nick Mathewson 2e21493a88 add missing subcategory in changes file 2017-10-05 11:04:54 -04:00
Nick Mathewson 5d516315f5 Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-05 11:03:35 -04:00
Nick Mathewson 2984d99165 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-05 11:03:35 -04:00
Nick Mathewson d6bdec1595 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-05 11:03:35 -04:00
Karsten Loesing b9d9b16b76 Update geoip and geoip6 to the October 4 2017 database. 2017-10-05 16:56:14 +02:00
Nick Mathewson 2ef4a59a40 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-20 08:32:55 -04:00
Nick Mathewson 2c93be80d9 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-20 08:32:55 -04:00
teor 8e52c46581 Remove longclaw's IPv6 address, as it will soon change
Authority IPv6 addresses were originally added in 0.2.8.1-alpha.

This leaves 3/8 directory authorities with IPv6 addresses, but there
are also 52 fallback directory mirrors with IPv6 addresses.

Resolves 19760.
2017-09-20 14:48:53 +10:00
Nick Mathewson 4cf9d65050 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-18 14:40:55 -04:00
Nick Mathewson 42e12a3537 Merge branch 'maint-0.2.8' into maint-0.2.9
"ours" to avoid version bump.
2017-09-18 14:40:22 -04:00
Nick Mathewson a57f1ff7ab bump to 0.2.9.12-dev 2017-09-18 14:39:46 -04:00
Nick Mathewson 0a72d1c8f1 bump to 0.2.8.15-dev 2017-09-18 14:39:40 -04:00
Nick Mathewson 2e47bfad4f finish changelog for 0.2.9.12 tor-0.2.9.12 2017-09-18 09:57:26 -04:00
Nick Mathewson 7c61c437b3 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-18 09:40:40 -04:00
Nick Mathewson 314652dc16 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-18 09:39:46 -04:00
Nick Mathewson 0ec72b0308 Merge branch 'trove-2017-008_028' into maint-0.2.8 2017-09-18 09:39:35 -04:00
Nick Mathewson 4a2cbea6ce Fix log-uninitialized-stack bug in rend_service_intro_established.
Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
2017-09-18 09:27:07 -04:00
Nick Mathewson dce1811cb8 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-14 13:22:17 -04:00
Nick Mathewson f7b06202c7 Merge branch 'maint-0.2.8' into maint-0.2.9
"ours" merge to avoid version bump.
2017-09-14 13:21:28 -04:00
Nick Mathewson 3c6d4fe046 version bump: 0.2.9.12 2017-09-14 13:20:29 -04:00
Nick Mathewson 26f68dfcef version bump: 0.2.8.15 2017-09-14 13:20:14 -04:00
Nick Mathewson 96ece9f0af more changelog fixes (029) 2017-09-14 13:18:45 -04:00
Nick Mathewson f96dc77b06 start assembling changelog for 0.2.9.12 2017-09-14 13:13:18 -04:00
Nick Mathewson b9ffcf6724 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-12 17:09:47 -04:00
Nick Mathewson 3138fe2e69 Merge branch 'bug15582_029' into maint-0.2.9 2017-09-12 17:09:42 -04:00
Nick Mathewson d9e2db1efd Avoid sscanf() warnings from openbsd in the unit tests
OpenBSD doesn't like tricks where you use a too-wide sscanf argument
for a too-narrow array, even when you know the input string
statically.  The fix here is just to use bigger buffers.

Fixes 15582; bugfix on a3dafd3f58 in 0.2.6.2-alpha.
2017-09-12 16:01:12 -04:00
Nick Mathewson abc22e8f1c Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-12 09:23:57 -04:00
Nick Mathewson bac160b4e0 One more implicit fallthrough warning to fix on GCC 7 2017-09-12 09:22:50 -04:00
Nick Mathewson 2cae7c8a29 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-11 17:49:18 -04:00
Andreas Stieger 6cd5a80275 Fix GCC 7 -Wimplicit-fallthrough warnings
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
2017-09-11 17:47:04 -04:00
Andreas Stieger b81a2e8f46 Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.

[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson 40f385dee7 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-11 16:29:10 -04:00
Nick Mathewson 6a49e3360b Fix mixed-sign comparison warning in fix for 22797. 2017-09-11 16:29:06 -04:00
Nick Mathewson a25d97e530 Merge branch 'teor-bug22797-025' into maint-0.2.9 2017-09-11 16:28:59 -04:00
Nick Mathewson 2fc33716ef Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-08 08:24:47 -04:00
Nick Mathewson 3cace828a9 Merge branch 'bug22644_029' into maint-0.2.9 2017-09-08 08:24:36 -04:00
Nick Mathewson bcf2b413c3 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-09-07 15:18:00 -04:00
Nick Mathewson 5c2a3854d3 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-07 15:18:00 -04:00
Nick Mathewson 08592c95fa Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-07 15:18:00 -04:00
Karsten Loesing 09618ffe38 Update geoip and geoip6 to the September 6 2017 database. 2017-09-07 21:06:16 +02:00
Nick Mathewson 12dad5ebf7 Fix crashes on empty +HSPOST and +POSTDESCRIPTOR commands
Fixes bug 22644; bugfix on 0.2.7.1-alpha and 0.2.0.1-alpha
respectively.
2017-09-07 09:20:00 -04:00
Nick Mathewson 93b28972c1 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-08-03 08:44:31 -04:00
Nick Mathewson 9914f906e3 Merge branch 'maint-0.2.9' into release-0.2.9 2017-08-03 08:44:31 -04:00
Nick Mathewson 9696021593 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-08-03 08:44:31 -04:00
Karsten Loesing 1280de42a4 Update geoip and geoip6 to the August 3 2017 database. 2017-08-03 10:00:54 +02:00
Nick Mathewson ad54a025d6 Merge branch 'maint-0.2.9' into release-0.2.9 2017-08-01 11:30:33 -04:00
Nick Mathewson 58e1c6dd86 Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9 2017-08-01 11:30:29 -04:00