d4fde97de2
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-09 07:27:25 -04:00
1af7f40dad
Merge branch 'tor-github/pr/1988' into maint-0.4.4
2020-07-09 07:27:13 -04:00
990ae1b027
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-09 07:25:26 -04:00
e0da64fd27
Handle a failure edge-case when a client-side intro circ opens.
2020-07-09 10:10:57 +03:00
562957e0db
socks: Returns 0xF6 only if BAD_HOSTNAME
...
This commit modifies the behavior of `parse_extended_address` in such a way
that if it fails, it will always return a `BAD_HOSTNAME` value, which is then
used to return the 0xF6 extended error code. This way, in any case that is
not a valid v2 address, we return the 0xF6 error code, which is the expected
behavior.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-07-08 16:20:31 -04:00
d973604981
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-08 00:36:48 +00:00
9603d8af0b
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-08 00:36:48 +00:00
c364e0e83b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-08 00:36:48 +00:00
b81e24cda6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-08 00:36:47 +00:00
3e08dd9df1
Resolve a compiler warning from a 32-bit signed/unsigned comparison
...
This warning only affects platforms (like win32) with 32-bit time_t.
Fixes bug 40028; bugfix on 0.3.2.8-rc.
2020-07-07 15:05:38 -04:00
80ae7d305a
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-07 14:48:36 +00:00
d4c79cae76
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-07 14:48:36 +00:00
a213d27938
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-07 14:48:36 +00:00
19d579e8cb
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-07 14:48:35 +00:00
d9cc2b2928
CI: Fix Appveyor printf format error
...
For some reasons, Appveyor started to use the stdio printf format for 64 bit
values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows
specific macros by setting D__USE_MINGW_ANSI_STDIO=0.
Fixes #40026
2020-07-07 09:53:54 -04:00
6883afe4fd
Start an 0.4.4.2-alpha changelog
2020-07-06 16:38:45 -04:00
6f882490e3
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-03 15:54:41 +03:00
05ca50c9a3
Merge branch 'tor-github/pr/1962' into maint-0.4.4
2020-07-03 15:54:24 +03:00
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
30e2652216
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-02 10:15:04 -04:00
18fa53fdf4
Merge branch 'ticket32622_044_squashed' into maint-0.4.4
2020-07-02 10:14:55 -04:00
65b05b12ab
Changes file for #32622 .
2020-07-02 10:14:48 -04:00
df246794f3
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-02 07:20:58 -04:00
8da10e8237
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-02 07:20:58 -04:00
5a5ff3d8c5
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-02 07:20:57 -04:00
07d8d398ca
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-02 07:20:57 -04:00
295a64dd61
Merge branch 'maint-0.4.4' into release-0.4.4
2020-07-01 12:55:03 +03:00
0d02c053f8
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-07-01 12:55:03 +03:00
1932a84ef5
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-01 12:55:02 +03:00
38208185be
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-01 12:55:02 +03:00
9beae02713
Merge branch 'tor-github/pr/1766' into maint-0.3.5
2020-07-01 12:54:29 +03:00
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
dbb70d85bf
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:23:41 +00:00
8697205be4
Merge branch 'tor-github/pr/1909' into maint-0.3.5
2020-06-30 14:23:17 +00:00
5a38c73f70
Merge branch 'tor-github/pr/1887' into maint-0.4.3
2020-06-30 14:19:28 +00:00
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +00:00
c9c4a3d0f6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 14:03:04 +00:00
8444fbe904
Merge branch 'tor-github/pr/1793' into maint-0.3.5
2020-06-30 13:55:39 +00:00
483082b57b
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:48:49 +00:00
c3ad2a1d23
Merge branch 'tor-github/pr/1785' into maint-0.3.5
2020-06-30 13:47:55 +00:00
b0bfee8c78
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-30 13:37:20 +00:00
bebdd2888f
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
2020-06-30 13:35:13 +00:00
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
a692b87f82
Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2
2020-06-29 13:53:27 -04:00
0575a182a6
Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
2020-06-29 13:48:25 -04:00
216456299f
Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2
2020-06-29 12:58:23 -04:00
3008255aea
Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3
2020-06-29 12:56:39 -04:00
fd8ce812b0
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-29 12:55:35 -04:00
0c0214bcc0
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
2020-06-29 12:55:27 -04:00
62b1b1bc62
Merge branch 'maint-0.4.4' into release-0.4.4
2020-06-25 07:36:56 -04:00
David Goulet
George Kadianakis
Guinness
Alexander Færøy
Nick Mathewson