Alexander Færøy
cee58b7f92
Merge branch 'maint-0.4.3' into release-0.4.3
2020-07-08 00:36:48 +00:00
Alexander Færøy
c364e0e83b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-07-08 00:36:48 +00:00
Alexander Færøy
b81e24cda6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-08 00:36:47 +00:00
Nick Mathewson
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
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
084cc7f6f8
Remove a changelog item that already appeared in 0.4.3.5
2020-07-06 17:05:35 -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
be17fa1693
Merge branch 'maint-0.4.3' into release-0.4.3
2020-06-30 14:23:41 +00: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
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
0a30935333
Merge branch 'maint-0.4.3' into release-0.4.3
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
0c714b2c55
Merge branch 'maint-0.4.3' into release-0.4.3
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
191a104afd
Merge branch 'maint-0.4.3' into release-0.4.3
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
b7f5113f72
Merge branch 'maint-0.4.3' into release-0.4.3
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
fc4e1697fd
Merge branch 'maint-0.4.3' into release-0.4.3
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
8a721e5208
Merge branch 'maint-0.4.3' into release-0.4.3
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
6a98e5f0d1
Merge branch 'maint-0.4.3' into release-0.4.3
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
1400573601
Merge branch 'maint-0.4.3' into release-0.4.3
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
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
