Nick Mathewson
731d4dbc56
Start on releasenotes for 0.3.3.6
...
Here I've just concatenated the changelogs and removed the "bugfix
on 0.3.3.x" entries.
2018-05-17 13:04:56 -04:00
Nick Mathewson
d0def59108
Begin work on a ChangeLog for 0.3.3.6
2018-05-17 12:59:33 -04:00
Nick Mathewson
3c4353179f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-16 12:11:45 -04:00
Nick Mathewson
8340f641c3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-16 12:11:45 -04:00
Nick Mathewson
d3a972561a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-16 12:11:45 -04:00
Nick Mathewson
ad5b4c4085
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-16 12:11:45 -04:00
Nick Mathewson
d1e4ffc710
Merge branch 'bug26072_029' into maint-0.2.9
2018-05-16 12:11:40 -04:00
Nick Mathewson
ddc3eb20b7
Merge branch 'bug26116_029' into bug26116_033
2018-05-16 11:43:53 -04:00
Nick Mathewson
881f7157f6
Return -1 from our PEM password callback
...
Apparently, contrary to its documentation, this is how OpenSSL now
wants us to report an error.
Fixes bug 26116; bugfix on 0.2.5.16.
2018-05-16 11:39:42 -04:00
Nick Mathewson
ca63a66604
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-15 09:32:45 -04:00
Nick Mathewson
6acbd4c112
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-15 09:32:44 -04:00
Nick Mathewson
4aa3d511b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-15 09:32:44 -04:00
Nick Mathewson
502d2c0062
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-15 09:32:44 -04:00
Karsten Loesing
033e4723f3
Update geoip and geoip6 to the May 1 2018 database.
2018-05-15 15:20:09 +02:00
Nick Mathewson
5eb2d58880
Add a missing return after marking a stream for bad connected cell
...
Fixes bug 26072; bugfix on 0.2.4.7-alpha.
2018-05-14 15:54:48 -04:00
Nick Mathewson
1118536142
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-10 09:22:32 -04:00
Nick Mathewson
b343ba9060
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 09:22:32 -04:00
Nick Mathewson
7ee67c47fa
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:22:32 -04:00
Nick Mathewson
2d61a83513
Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1
2018-05-10 09:22:14 -04:00
Nick Mathewson
f36fea697e
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-10 09:19:28 -04:00
Nick Mathewson
f64fa6b19e
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 09:19:28 -04:00
Nick Mathewson
15b8c860d3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:19:28 -04:00
Nick Mathewson
ba70439210
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-10 09:19:28 -04:00
Nick Mathewson
edb6acf9ce
Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
2018-05-10 09:19:09 -04:00
David Goulet
6e99286d45
hs-v3: Add an extra white-space when parsing descriptor
...
The specification describes the signature token to be right after a newline
(\n) then the token "signature" and then a white-space followed by the encoded
signature.
This commit makes sure that when we parse the signature from the descriptor,
we are always looking for that extra white-space at the end of the token.
It will allow us also to support future fields that might start with
"signature".
Fixes #26069
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-10 09:16:50 -04:00
Nick Mathewson
62b224f724
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-10 08:20:38 -04:00
Nick Mathewson
59812789f7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 08:03:04 -04:00
Nick Mathewson
e5acbbd16d
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 08:02:10 -04:00
Nick Mathewson
aa08c19703
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-10 08:00:35 -04:00
David Goulet
bca8a104b2
Having a ControlPort open doesn't mean we are a client
...
The any_client_port_set() returns true if the ControlPort is set which is
wrong because we can have that port open but still not behave as a tor client
(like many relays for instance).
Fixes #26062
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-09 12:50:53 -04:00
juga0
dbdde76f56
Test read bandwidth measurements with empty file
2018-05-09 15:58:25 +00:00
Nick Mathewson
ff46d08fd4
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-09 11:53:18 -04:00
Nick Mathewson
abde29824c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-09 11:53:18 -04:00
Nick Mathewson
394f102ea6
Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
2018-05-09 11:53:15 -04:00
teor
867fe40f91
Stop logging stack contents when reading a zero-length bandwidth file
...
When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.
Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-05-09 15:19:28 +00:00
Nick Mathewson
582f784548
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-09 08:26:08 -04:00
Nick Mathewson
a639a67844
Merge branch 'libressl_201805_033' into maint-0.3.3
2018-05-09 08:25:32 -04:00
George Kadianakis
7e8c5e3662
Detect when v3 services get disabled after HUP.
...
Remove v3 optimization which made Tor not detect disabling services.
This optimization is not so needed because we only call that function after HUP
anyway.
Fixes bug #25761 .
2018-05-09 11:25:00 +03:00
George Kadianakis
5dc00c0661
Detect when v2 services get disabled after HUP.
...
During service configuration, rend_service_prune_list_impl_() sets
rend_service_staging_list to NULL, which blocked pruning after a HUP.
This patch initializes rend_service_staging_list when needed, so that HUP can
detect disabled onion services.
Fixes bug #25761 .
2018-05-09 11:25:00 +03:00
Roger Dingledine
6db0c006b2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-08 13:49:34 -04:00
Roger Dingledine
b979415e8b
manpage fix to stop saying CacheIPv4DNS is on by default
...
Stop saying in the manual that clients cache ipv4 dns answers from exit
relays. We haven't used them since 0.2.6.3-alpha, and in ticket 24050
we stopped even caching them as of 0.3.2.6-alpha, but we forgot to say
so in the man page.
Fixes bug 26052; bugfix on 0.3.2.6-alpha.
2018-05-08 13:13:45 -04:00
Nick Mathewson
0e4f7b56a2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-07 13:33:19 -04:00
Nick Mathewson
46002aa691
Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
2018-05-07 13:33:12 -04:00
Nick Mathewson
6361a250f0
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-03 13:38:54 -04:00
Nick Mathewson
be5b4415c2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-03 13:38:54 -04:00
Nick Mathewson
40456054ea
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-03 13:38:54 -04:00
Nick Mathewson
4c6a407b9d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-03 13:38:54 -04:00
Nick Mathewson
44626b37f6
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
2018-05-03 13:38:51 -04:00
Nick Mathewson
726f238b72
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
2018-05-03 13:38:46 -04:00
Nick Mathewson
5227754b2f
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
2018-05-03 13:38:37 -04:00