George Kadianakis
05ca50c9a3
Merge branch 'tor-github/pr/1962' into maint-0.4.4
2020-07-03 15:54:24 +03:00
David Goulet
6ff4596753
hs-v2: Add deprecation warning for service
...
If at least one service is configured as a version 2, a log warning is emitted
once and only once.
Closes #40003
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-03 15:52:54 +03:00
Nick Mathewson
18fa53fdf4
Merge branch 'ticket32622_044_squashed' into maint-0.4.4
2020-07-02 10:14:55 -04:00
Nick Mathewson
65b05b12ab
Changes file for #32622 .
2020-07-02 10:14:48 -04:00
Nick Mathewson
7b5f58a1c9
Carry TLS error strings forward to controller when reporting them.
...
Now instead of saying "DONE, DONE" or "MISC, MISC" or "TLS_ERROR,
TLS_ERROR", we can finally give a nice sensible "TLS_ERROR,
wrong version number" which should help debug a great deal.
Closes ticket 32622.
2020-07-02 10:14:48 -04:00
David Goulet
8da10e8237
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-02 07:20:58 -04:00
David Goulet
5a5ff3d8c5
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-02 07:20:57 -04:00
David Goulet
07d8d398ca
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-02 07:20:57 -04:00
George Kadianakis
0d02c053f8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-01 12:55:03 +03:00
George Kadianakis
1932a84ef5
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-01 12:55:02 +03:00
George Kadianakis
38208185be
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-01 12:55:02 +03:00
George Kadianakis
9beae02713
Merge branch 'tor-github/pr/1766' into maint-0.3.5
2020-07-01 12:54:29 +03:00
Nick Mathewson
39830b6408
Downgrade "Bug: No entry found in extrainfo map" message.
...
This is not actually a bug! It can happen for a bunch of reasons,
which all boil down to "trying to add an extrainfo for which we no
longer have the corresponding routerinfo".
Fixes #16016 ; bugfix on 0.2.6.3-alpha.
2020-06-30 11:54:13 -04:00
Alexander Færøy
322abd4fd9
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:23:41 +00:00
Alexander Færøy
dbb70d85bf
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:23:41 +00:00
Alexander Færøy
9638c6d7a7
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:23:41 +00:00
Alexander Færøy
8697205be4
Merge branch 'tor-github/pr/1909' into maint-0.3.5
2020-06-30 14:23:17 +00:00
Alexander Færøy
0d5152fc53
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:19:44 +00:00
Alexander Færøy
5a38c73f70
Merge branch 'tor-github/pr/1887' into maint-0.4.3
2020-06-30 14:19:28 +00:00
Alexander Færøy
bb5745d656
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:16:16 +00:00
Alexander Færøy
fb46d1bb34
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:16:16 +00:00
Alexander Færøy
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +00:00
Alexander Færøy
572cf774b9
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 14:03:04 +00:00
Alexander Færøy
38f3cf4103
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 14:03:04 +00:00
Alexander Færøy
c9c4a3d0f6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:03:04 +00:00
Alexander Færøy
8444fbe904
Merge branch 'tor-github/pr/1793' into maint-0.3.5
2020-06-30 13:55:39 +00:00
Alexander Færøy
aced9be224
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 13:48:49 +00:00
Alexander Færøy
2042ebe88e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 13:48:49 +00:00
Alexander Færøy
483082b57b
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:48:49 +00:00
Alexander Færøy
c3ad2a1d23
Merge branch 'tor-github/pr/1785' into maint-0.3.5
2020-06-30 13:47:55 +00:00
Alexander Færøy
21cf91ee2c
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-30 13:37:20 +00:00
Alexander Færøy
c57896a76e
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-30 13:37:20 +00:00
Alexander Færøy
b0bfee8c78
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:37:20 +00:00
Alexander Færøy
bebdd2888f
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
2020-06-30 13:35:13 +00:00
Nick Mathewson
feddba6f8b
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:57:50 -04:00
Nick Mathewson
eef77227ef
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:57:41 -04:00
Nick Mathewson
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
Nick Mathewson
b2ce815bd8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:56:16 -04:00
Nick Mathewson
d124cfc058
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:56:04 -04:00
Nick Mathewson
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
Nick Mathewson
9e85515f83
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 13:48:32 -04:00
Nick Mathewson
31bdfd4920
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 13:48:32 -04:00
Nick Mathewson
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
Nick Mathewson
6fb31bb34a
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:58:50 -04:00
Nick Mathewson
f862971d04
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-29 12:58:50 -04:00
Nick Mathewson
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00
Nick Mathewson
41a4243901
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:56:50 -04:00
Nick Mathewson
3008255aea
Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3
2020-06-29 12:56:39 -04:00
Nick Mathewson
fd8ce812b0
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-29 12:55:35 -04:00
Nick Mathewson
2c61f22e43
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-29 12:55:35 -04:00
