Nick Mathewson
94f3007627
Merge branch 'bug26158_031' into maint-0.3.1
2018-06-13 09:58:01 -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
76e9de7c6d
Merge branch '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
8c8ed91aae
Merge remote-tracking branch 'rl1987/bug24891'
2018-06-13 09:46:50 -04:00
George Kadianakis
99974d4c1e
Silence warning of relaycell/circbw tst.
...
Shouldn't send RELAY_COMMAND_DATA cell with 0 stream id.
2018-06-13 14:14:17 +03:00
George Kadianakis
2520ee34c6
Require live consensus to compute responsible HSDirs.
...
Here is how this changes the HSv3 client-side and service-side:
For service side we already required live consensus to upload descriptors (see
9e900d1db7
) so we should never get there without
a live consensus.
For the client-side we now require a live consensus to attempt to connect to
HS. While this changes the client behavior in principle, it doesn't really
change it, because we always required live consensus to set HSDir indices, so
before this patch a client with no live consensus would try to compute
responsible HSDirs without any HSDir indices and bug out. This makes the client
behavior more consistent, by requiring a live consensus (and hence a
semi-synced clock) for the client to connect to an HS entirely.
The alternative would have been to allow setting HSDir indices with a non-live
consensus, but this would cause the various problems outlined by commit
b89d2fa1db
.
2018-06-13 13:42:34 +03:00
Nick Mathewson
1b04dab60c
copy 0.3.3.7 changelog forward to master
2018-06-12 12:06:26 -04:00
Nick Mathewson
147c67d81d
Merge branch 'maint-0.3.3'
...
"ours" to avoid version bump.
2018-06-12 12:05:18 -04:00
Nick Mathewson
bbbb5f39be
bump to 0.3.3.7-dev
2018-06-12 12:05:09 -04:00
Nick Mathewson
ccf2d65610
bump to 0.3.4.2-alpha-dev
2018-06-12 12:04:58 -04:00
Nick Mathewson
bc951e83aa
Fold in changelog entry.
2018-06-12 09:47:07 -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
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
03f3ee6d74
Merge branch 'maint-0.3.3'
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
b13fe14cb0
Merge branch 'maint-0.3.3'
...
"ours" merge to avoid version bump.
2018-06-12 08:57:25 -04:00
Nick Mathewson
f2e7570c75
Bump to 0.3.3.7
2018-06-12 08:57:09 -04:00
Nick Mathewson
73aae608d5
Remove folded-in changes files
2018-06-12 08:56:28 -04:00
Nick Mathewson
4540ddd3e3
Lightly edit changelog
...
Remove the "documentation" section, since a comment-only change
doesn't usually get a changelog entry.
2018-06-12 08:46:35 -04:00
Nick Mathewson
e9ecb09786
format changelog.
2018-06-12 08:36:48 -04:00
Nick Mathewson
33919d8e1d
add more entries to changelog
2018-06-12 08:36:28 -04:00
Nick Mathewson
6230dfaf14
Merge branch 'maint-0.3.3'
2018-06-12 08:18:57 -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
d84581a3e6
Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1
2018-06-12 08:18:53 -04:00
Nick Mathewson
f4e51990b9
Merge remote-tracking branch 'rl1987/bug26283'
2018-06-12 08:17:48 -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
b2470f5140
Merge branch 'maint-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
fa195626bd
bump to 0.3.4.2-alpha
2018-06-11 16:49:17 -04:00
Nick Mathewson
8be3513743
start the 0.3.4.2-alpha changelog
2018-06-11 16:37:08 -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
f399887cfe
Merge remote-tracking branch 'mikeperry-github/bug26259'
2018-06-08 10:17:00 -04: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
307008e869
Merge branch 'maint-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
Nick Mathewson
aef0607f38
Merge branch 'maint-0.3.3'
2018-06-08 10:11:57 -04:00
Nick Mathewson
c27bb4072c
Merge branch 'maint-0.3.2' into maint-0.3.3
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
rl1987
9876575d2c
Silence -Wbad-function-cast warning (when DEBUG_SMARTLIST is on)
2018-06-03 16:45:09 +03: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
3716ddf1b4
Merge remote-tracking branch 'rl1987/doc25237'
2018-06-02 11:35:06 -07:00
Nick Mathewson
9f884a38e3
Merge branch 'maint-0.3.3'
2018-06-02 10:36:49 -07:00