Alexander Færøy
dc45f0a8cb
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-07 14:48:36 +00:00
Alexander Færøy
a213d27938
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-07 14:48:36 +00:00
Alexander Færøy
19d579e8cb
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-07 14:48:35 +00:00
David Goulet
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
Nick Mathewson
c8f1ccbaef
Start 0.4.3.6 changelog
2020-07-06 16:52:41 -04:00
Nick Mathewson
8f72303699
Remove changes files that were included in 0.4.3.5
2020-07-06 16:47:56 -04:00
David Goulet
9eedfefc3d
Merge branch 'maint-0.4.3' into release-0.4.3
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
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
dbb70d85bf
Merge branch 'maint-0.3.5' into maint-0.4.2
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
ff4bd66998
Merge branch 'maint-0.4.3' into release-0.4.3
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
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +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
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
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
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -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
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
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
388210ceb9
Merge branch 'maint-0.4.3' into release-0.4.3
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
0c0214bcc0
Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5
2020-06-29 12:55:27 -04:00
George Kadianakis
7c7e2e2fea
Merge branch 'maint-0.4.3' into release-0.4.3
2020-06-02 14:05:42 +03:00
George Kadianakis
6b05d447bb
Merge branch 'tor-github/pr/1909' into maint-0.4.3
2020-06-02 14:05:33 +03:00
Nick Mathewson
bd61a36fde
Merge branch 'maint-0.4.3' into release-0.4.3
2020-06-01 09:47:45 -04:00
Nick Mathewson
688d1b3f03
Merge remote-tracking branch 'tor-github/pr/1905/head' into maint-0.4.3
2020-06-01 09:47:37 -04:00
Roger Dingledine
39f2411b3f
Preemptive circs should work with UseEntryGuards 0
...
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469 ), leading to slower load times.
Fixes bug 34303; bugfix on 0.3.3.2-alpha.
2020-05-30 02:20:48 -04:00
George Kadianakis
a93a9cfe23
Merge branch 'maint-0.4.3' into release-0.4.3
2020-05-28 12:52:48 +03:00
George Kadianakis
6891d1bbcb
Merge branch 'tor-github/pr/1792' into maint-0.4.3
2020-05-28 12:25:57 +03:00
David Goulet
ca356b952e
changes: Add changes file for ticket 33458
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-05-28 12:25:42 +03:00
Roger Dingledine
d6186c7435
Man page: MinUptimeHidServDirectoryV2 defaults to 96 hours
...
Bugfix on 0.2.6.3-alpha; fixes bug 34299.
2020-05-23 04:37:57 -04:00
Nick Mathewson
2d331e30c6
Merge branch 'maint-0.4.3' into release-0.4.3
2020-05-19 09:39:12 -04:00
Nick Mathewson
68fe8826dd
Doxygen: fix unbalanced groups.
...
Closes ticket 34255.
2020-05-19 09:18:39 -04:00
Nick Mathewson
577655d6b8
Merge branch 'maint-0.4.3' into release-0.4.3
2020-05-15 10:28:36 -04:00
Nick Mathewson
6f2b6ede1b
Add a changes file for 34233.
...
This bug was merged back to 0.3.5 with our #34078 fix, but only
released in 0.4.3.5, so the changes file goes here.
2020-05-15 10:27:49 -04:00
Daniel Pinto
2913dbd6d9
Fix crash when tor is compiled with NSS and seccomp sandbox is enabled
...
Adds seccomp rules for socket and getpeername used by NSS
2020-05-12 12:56:06 -04:00
Nick Mathewson
a58dda96b6
Merge branch 'maint-0.4.3' into release-0.4.3
2020-05-06 17:18:46 -04:00
Nick Mathewson
b444096be5
Fix a boolean logic error when logging about invalid hostnames.
...
Fixes bug 34131; bugfix on 0.4.3.1-alpha.
2020-05-06 17:15:37 -04:00
Nick Mathewson
275b9f1e41
Merge branch 'maint-0.4.3' into release-0.4.3
2020-05-06 16:58:12 -04:00
Nick Mathewson
ae1ebb5f44
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-05-06 16:58:12 -04:00
Nick Mathewson
d46f67ef0e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-06 16:58:12 -04:00
Nick Mathewson
633366efcd
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-05-06 16:58:12 -04:00
Nick Mathewson
dd795fbee4
changes file for bug 34078.
2020-05-06 16:58:06 -04:00