Nick Mathewson
2d4983dcd7
Merge branch 'maint-0.2.8' into release-0.2.8
2017-10-23 09:06:34 -04:00
Nick Mathewson
8cc147aa83
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 09:04:56 -04:00
David Goulet
15a699462d
dirauth: Add bastet to the default authorities
...
Fixes #23910
Based on a patch by dgoulet; backported to 0.2.5
2017-10-23 09:03:36 -04:00
Nick Mathewson
15a7e24dcd
Merge branch 'maint-0.2.8' into release-0.2.8
2017-10-23 08:59:11 -04:00
Nick Mathewson
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -04:00
Nick Mathewson
2f9032f1cc
Merge branch 'maint-0.2.8' into release-0.2.8
2017-10-23 08:53:24 -04:00
Nick Mathewson
6f87a85897
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
2017-10-23 08:53:14 -04:00
Nick Mathewson
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
Nick Mathewson
bad224df85
Merge branch 'maint-0.2.8' into release-0.2.8
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
adec001c9a
Merge branch 'maint-0.2.8' into release-0.2.8
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
f7222e6d8c
Clear outbuf_flushlen when we clear a connection's outbuf
...
When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0. This could cause
an assertion failure later on in flush_buf().
Fixes bug 23690; bugfix on 0.2.6.1-alpha.
2017-09-29 10:00:14 -04:00
Nick Mathewson
254535a142
Merge branch 'maint-0.2.8' into release-0.2.8
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
9eaa66db0b
Merge branch 'maint-0.2.8' into release-0.2.8
2017-09-18 14:40:55 -04:00
Nick Mathewson
0a72d1c8f1
bump to 0.2.8.15-dev
2017-09-18 14:39:40 -04:00
Nick Mathewson
e25e980285
Finish changelog for 0.2.8.15
2017-09-18 09:57:45 -04:00
Nick Mathewson
7cab15eabc
Merge branch 'maint-0.2.8' into release-0.2.8
2017-09-18 09:40:40 -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
8d34a6ea9c
Merge branch 'maint-0.2.8' into release-0.2.8
2017-09-14 13:22:17 -04:00
Nick Mathewson
26f68dfcef
version bump: 0.2.8.15
2017-09-14 13:20:14 -04:00
Nick Mathewson
e38b0c2eb9
start on changelog for 0.2.8.14
2017-09-14 13:18:32 -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
6e37ba5543
Merge branch 'maint-0.2.8' into release-0.2.8
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
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
Nick Mathewson
fa22cc6514
Merge branch 'maint-0.2.8' into release-0.2.8
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
0e7558ab64
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-08-01 11:19:29 -04:00
Nick Mathewson
14f3f8e341
Merge branch 'maint-0.2.8' into release-0.2.8
2017-08-01 11:19:29 -04:00
Nick Mathewson
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
Nick Mathewson
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00
Nick Mathewson
0bfd1c318c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-08-01 11:19:28 -04:00
Nick Mathewson
6199e27a2b
Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4
2017-08-01 11:19:24 -04:00
Nick Mathewson
5c5eb0f095
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-26 15:39:55 -04:00
Nick Mathewson
6d3b808198
Merge branch 'maint-0.2.8' into release-0.2.8
2017-07-26 15:39:55 -04:00
Nick Mathewson
ddd66cc019
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-26 15:39:55 -04:00
Nick Mathewson
f794b40ec0
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-26 15:39:55 -04:00
Nick Mathewson
af39c13a03
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-26 15:39:55 -04:00
Nick Mathewson
ebb441ded2
Point travis to #tor-ci, not #tor-bots
2017-07-26 15:39:50 -04:00
Nick Mathewson
1ee8ed4b63
Merge branch 'maint-0.2.8' into release-0.2.8
2017-07-26 15:38:48 -04:00
Nick Mathewson
fbf93614c9
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-07-26 15:35:07 -04:00
Nick Mathewson
c362c6a852
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-07-26 15:35:01 -04:00
Nick Mathewson
0ad5a6b034
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-07-26 15:34:56 -04:00
Nick Mathewson
09618bc488
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-07-26 15:34:40 -04:00
Isis Lovecruft
6d0af8dacc
In < 0.2.9.x, --enable-fatal-warnings was --enable-gcc-warnings.
2017-07-25 01:03:15 +00:00
