db9ca07c46
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-27 10:04:42 -04:00
fa1890e97f
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
2018-05-27 10:03:11 -04:00
c8dad04924
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-24 09:40:06 -04:00
c000763f1e
Merge branch 'bug26116_033' into maint-0.3.3
2018-05-24 09:40:00 -04:00
b6a88173bb
add TROVE-2018-005 to changelog and releasenotes
2018-05-22 12:37:49 -04:00
f177ec2142
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-22 12:33:54 -04:00
a3a8d80beb
Merge branch 'trove-2018-005_032' into trove-2018-005_033
2018-05-22 12:27:15 -04:00
d2bc019053
changes file for TROVE-2018-005
2018-05-22 12:26:23 -04:00
2b2634339b
Move bug25145 entry into ChangeLog
...
(It doesn't go into ReleaseNotes, since it's a bugfix on 0.3.3.2-alpha)
2018-05-22 10:20:15 -04:00
c91c4e9bb6
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-22 08:35:41 -04:00
3d12663243
Fix a crash bug when testing reachability
...
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
2018-05-22 08:35:37 -04:00
d0def59108
Begin work on a ChangeLog for 0.3.3.6
2018-05-17 12:59:33 -04:00
8340f641c3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-16 12:11:45 -04:00
3c4353179f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-16 12:11:45 -04:00
ad5b4c4085
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-16 12:11:45 -04:00
d3a972561a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-16 12:11:45 -04:00
d1e4ffc710
Merge branch 'bug26072_029' into maint-0.2.9
2018-05-16 12:11:40 -04:00
ddc3eb20b7
Merge branch 'bug26116_029' into bug26116_033
2018-05-16 11:43:53 -04:00
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
ca63a66604
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-15 09:32:45 -04:00
4aa3d511b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-15 09:32:44 -04:00
6acbd4c112
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-15 09:32:44 -04:00
502d2c0062
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-15 09:32:44 -04:00
033e4723f3
Update geoip and geoip6 to the May 1 2018 database.
2018-05-15 15:20:09 +02:00
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
1118536142
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-10 09:22:32 -04:00
7ee67c47fa
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:22:32 -04:00
b343ba9060
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 09:22:32 -04:00
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
62b224f724
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-10 08:20:38 -04:00
59812789f7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 08:03:04 -04:00
e5acbbd16d
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 08:02:10 -04:00
aa08c19703
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-10 08:00:35 -04:00
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
ff46d08fd4
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-09 11:53:18 -04:00
abde29824c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-09 11:53:18 -04:00
394f102ea6
Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
2018-05-09 11:53:15 -04:00
582f784548
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-09 08:26:08 -04:00
a639a67844
Merge branch 'libressl_201805_033' into maint-0.3.3
2018-05-09 08:25:32 -04:00
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
6db0c006b2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-08 13:49:34 -04:00
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
0e4f7b56a2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-07 13:33:19 -04:00
46002aa691
Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
2018-05-07 13:33:12 -04:00
246765342e
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-02 08:46:28 -04:00
993e314c6f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-02 08:46:28 -04:00
8e81d329ee
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-02 08:46:28 -04:00
c66b512671
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-02 08:46:28 -04:00
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
bf3e899dce
Merge branch 'libressl_201805_029' into maint-0.3.3
2018-05-02 08:26:49 -04:00
Nick Mathewson
Karsten Loesing
David Goulet
George Kadianakis
Roger Dingledine
teor