Nick Mathewson
2e71f3ccfe
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-13 09:57:10 -04:00
Nick Mathewson
1c80eb92fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-13 09:57:10 -04:00
Nick Mathewson
ff70cc84f8
Merge branch 'bug25686_diagnostic_032' into maint-0.3.2
2018-06-13 09:56:17 -04:00
Nick Mathewson
bc5d904237
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-12 12:05:32 -04:00
Nick Mathewson
bbbb5f39be
bump to 0.3.3.7-dev
2018-06-12 12:05:09 -04:00
Nick Mathewson
035a35178c
Fold in changelog entry.
tor-0.3.3.7
2018-06-12 09:47:25 -04:00
Nick Mathewson
53513e4bfe
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 09:44:17 -04:00
Nick Mathewson
eaa359650c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 09:44:17 -04:00
Nick Mathewson
ce959b9424
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-12 09:44:17 -04:00
Nick Mathewson
16381b579e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 09:44:17 -04:00
Nick Mathewson
ef671147f2
Merge branch 'dannenberg_ipv6_029' into maint-0.2.9
2018-06-12 09:44:13 -04:00
Linus Nordberg
2ef448da2f
Add a changelog entry.
2018-06-12 09:44:01 -04:00
Linus Nordberg
6cf9288518
Add IPv6 orport address for dannenberg.
2018-06-12 09:44:01 -04:00
Nick Mathewson
ef0b19aec6
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-12 08:57:37 -04:00
Nick Mathewson
f2e7570c75
Bump to 0.3.3.7
2018-06-12 08:57:09 -04:00
Nick Mathewson
7b7b817c3e
changelog for 0.3.3.7
2018-06-12 08:56:05 -04:00
Nick Mathewson
5d8a927aa3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 08:18:56 -04:00
Nick Mathewson
7fff99110b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 08:18:56 -04:00
Nick Mathewson
9ff769c492
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-12 08:18:56 -04:00
Nick Mathewson
d84581a3e6
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
2018-06-12 08:18:53 -04:00
Nick Mathewson
74ac463e7f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 08:11:20 -04:00
Nick Mathewson
6dca180ae9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 08:11:20 -04:00
Nick Mathewson
3cca9a103d
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-12 08:11:20 -04:00
Nick Mathewson
19f3868523
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 08:11:19 -04:00
Nick Mathewson
faf4580061
Several attempts to diagnose ticket 25686
...
There are a few reasons that relays might be uploading desciptors
without saying X-Desc-Gen-Reason:
1. They are running an old version of our software, before 0.3.2.stable.
2. They are not running our software, but they are claiming they
are.
3. They are uploading through a proxy that strips X-Desc-Gen-Reason.
4. They somehow had a bug in their software.
According to the 25686 data, 1 is the most common reason. This
ticket is an attempt to diagnose case 4, or prove that case 4
doesn't actually happen.
2018-06-11 16:24:00 -04:00
Karsten Loesing
ae540569ce
Update geoip and geoip6 to the June 7 2018 database.
2018-06-11 21:58:55 +02:00
Nick Mathewson
a141127435
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-08 10:12:57 -04:00
Nick Mathewson
79c56a6e31
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-08 10:12:57 -04:00
Nick Mathewson
dd63033fcb
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-08 10:11:57 -04:00
Nick Mathewson
1ef8023e00
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-08 10:11:57 -04:00
rl1987
719b5c1d27
Avoid out-of-bounds smartlist access in protover_compute_vote()
...
and contract_protocol_list()
2018-06-08 10:11:32 -04:00
teor
8366be3b51
Silence unused-const-variable warnings in zstd.h on some gcc versions
...
Fixes bug 26272; bugfix on 0.3.1.1-alpha.
2018-06-02 14:11:04 -07:00
Nick Mathewson
0c9d617762
Merge branch 'maint-0.3.3' into release-0.3.3
2018-06-02 10:42:06 -07:00
Nick Mathewson
f15f90e2ca
Merge branch 'bug26121-033-squashed' into maint-0.3.3
2018-06-02 10:36:44 -07:00
Mike Perry
fe5764012a
Bug 26121: Improve BUILDTIMEOUT_SET accuracy.
...
We were miscounting the total number of circuits for the TIMEOUT_RATE and
CLOSE_RATE fields of this event.
2018-06-02 10:36:36 -07:00
Nick Mathewson
db9ca07c46
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-27 10:04:42 -04:00
Nick Mathewson
fa1890e97f
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
2018-05-27 10:03:11 -04:00
Nick Mathewson
3f3739c6e0
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-24 09:40:06 -04:00
Nick Mathewson
f48fb8a720
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-24 09:40:06 -04:00
Nick Mathewson
c8dad04924
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-24 09:40:06 -04:00
Nick Mathewson
0ef432d457
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-24 09:40:06 -04:00
Nick Mathewson
c000763f1e
Merge branch 'bug26116_033' into maint-0.3.3
2018-05-24 09:40:00 -04:00
Nick Mathewson
c380562aed
Merge branch 'bug26116_029' into maint-0.2.9
2018-05-24 09:39:46 -04:00
Nick Mathewson
aeb4be1d5a
Add a unit test for PEM-encrypted documents.
2018-05-24 09:36:33 -04:00
Nick Mathewson
c11c851b39
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-22 18:05:55 -04:00
Nick Mathewson
ff27b7ce60
Update version to 0.3.3.6-dev
2018-05-22 18:05:28 -04:00
Roger Dingledine
7dd0813e78
and put those in the release notes too
tor-0.3.3.6
2018-05-22 16:14:39 -04:00
Roger Dingledine
6a7d650b37
0.3.1.10 and 0.2.9.15 changelogs got left out too
2018-05-22 16:13:29 -04:00
Roger Dingledine
568cb0ee8f
run nickm's format_changelog.py script
2018-05-22 15:51:54 -04:00
Roger Dingledine
35956bce49
a few more changelog fixes
2018-05-22 15:47:18 -04:00