Nick Mathewson
800797e7f3
Merge branch 'bug23291_028' into maint-0.2.8
2017-11-13 12:57:55 -05:00
Nick Mathewson
c9b76a12f5
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-11 12:23:33 -05:00
Karsten Loesing
6f8c32b7de
Update geoip and geoip6 to the November 6 2017 database.
2017-11-10 10:14:09 +01:00
Nick Mathewson
faf568fa7e
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" merge to avoid version bump
2017-10-25 09:28:15 -04:00
Nick Mathewson
9969b0dfda
bump to 0.2.8.16-dev
2017-10-25 09:27:07 -04:00
Nick Mathewson
82f8b27ff5
bump to 0.2.5.15-dev
2017-10-25 09:26:53 -04:00
Nick Mathewson
912ebf165f
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" merge to avoid version bump
2017-10-24 09:10:04 -04:00
Nick Mathewson
d4befa035d
bump to 0.2.8.16
2017-10-24 09:09:10 -04:00
Nick Mathewson
743eee4930
bump to 0.2.5.15
2017-10-24 09:09:00 -04:00
Nick Mathewson
a5f5bda462
Adjust test, now that there are 9 dirauths again
2017-10-23 09:11:07 -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
9a1b385462
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-23 08:58:28 -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
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
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
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
0a72d1c8f1
bump to 0.2.8.15-dev
2017-09-18 14:39: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
26f68dfcef
version bump: 0.2.8.15
2017-09-14 13:20:14 -04:00
Nick Mathewson
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-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
b943cedf34
changes file for bug 23291
2017-08-21 15:04:35 -04:00
Ties Stuij
7ba873ca2d
22839: fix check_heap_buffer buffer size in test-memwipe
2017-08-21 15:03:54 -04:00
Nick Mathewson
93b28972c1
Merge branch 'maint-0.2.5' into maint-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
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
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
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
Isis Lovecruft
c718644251
Builds on CI should use --enable-fragile-hardening.
...
(cherry picked from commit c91a57ccf90308c6728184b43519f96b61acb95d)
2017-07-25 00:54:11 +00:00
Isis Lovecruft
f2e3d13930
Install optional dependencies during Travis CI builds.
...
(cherry picked from commit 1bb00fb812c0df7a574ed62e9f53b0e8192c7d04)
2017-07-25 00:54:01 +00:00
Isis Lovecruft
d0cabbf2c5
Fix CI homebrew checks for outdated packages.
...
(cherry picked from commit 8f8689f70235dc19cbc5092ea148af5772a9cdc3)
2017-07-25 00:52:05 +00:00
Isis Lovecruft
7b4585e2a3
Add a changes file for bug22636.
2017-07-17 21:44:59 +00:00