Nick Mathewson
14ec62f064
Merge branch 'maint-0.3.2' into release-0.3.2
2018-06-08 10:11: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
Nick Mathewson
432620e44e
Merge branch 'maint-0.3.2' into release-0.3.2
2018-05-24 09:40:06 -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
c380562aed
Merge branch 'bug26116_029' into maint-0.2.9
2018-05-24 09:39:46 -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
79bee260ee
Merge branch 'maint-0.3.2' into release-0.3.2
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
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
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
Nick Mathewson
e8edd97c1c
Merge branch 'maint-0.3.2' into release-0.3.2
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
7ee67c47fa
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:22:32 -04:00
Nick Mathewson
e935e27676
Merge branch 'maint-0.3.2' into release-0.3.2
2018-05-10 09:22:32 -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
a15009bd38
Merge branch 'maint-0.3.2' into release-0.3.2
2018-05-10 08:20:38 -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
Nick Mathewson
7e1102ff25
Merge branch 'maint-0.3.2' into release-0.3.2
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
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
Nick Mathewson
4b14ff45fd
Merge branch 'maint-0.3.2' into release-0.3.2
2018-05-02 08:46:28 -04:00
Nick Mathewson
246765342e
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-02 08:46:28 -04:00
Nick Mathewson
993e314c6f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-02 08:46:28 -04:00
teor
d465bd27ed
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-02 22:36:23 +10:00
Nick Mathewson
7a55efbd59
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 10:38:37 -04:00
Nick Mathewson
89a3fafd49
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 10:38:37 -04:00
Nick Mathewson
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
Nick Mathewson
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
Nick Mathewson
31e69ac222
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 10:37:36 -04:00
Nick Mathewson
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
Nick Mathewson
3abd57fa0a
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
David Goulet
b259008c56
hs: Fix memleak in v3 on SIGHUP
...
Fixes #25901
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 11:09:57 -04:00
Nick Mathewson
ecb51bf9f3
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
Nick Mathewson
65fd973754
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-17 10:48:18 -04:00
Nick Mathewson
f0230ee38a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-17 10:48:18 -04:00
Nick Mathewson
ce8e7427b9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-17 10:48:08 -04:00