bd7174bb98
Merge branch 'maint-0.4.2' into release-0.4.2
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
be3baeb879
Merge branch 'maint-0.4.2' into release-0.4.2
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
0e10a162bd
Start on a changelog for 0.4.2.8
2020-07-06 17:04:30 -04:00
07d8d398ca
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-07-02 07:20:57 -04:00
1a50657e83
Merge branch 'maint-0.4.2' into release-0.4.2
2020-07-02 07:20:57 -04: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
7d833ee334
Merge branch 'maint-0.4.2' into release-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
511e1cfde4
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 14:16:16 +00:00
881f50a9a9
Merge branch 'tor-github/pr/1806' into maint-0.4.2
2020-06-30 14:15:57 +00:00
1b106cdedf
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 14:03:04 +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
19d9d0ee53
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 13:48:49 +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
c10323faae
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-30 13:37:20 +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
ec2bc07f42
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:57:50 -04:00
d235e523d5
Merge branch 'ticket33290_v2_042' into maint-0.4.2
2020-06-29 13:57:13 -04:00
5668287fe7
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:53:39 -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
64b8ee3f9e
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 13:48:32 -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
57390b76bf
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 12:58:50 -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
51b4a4bd1c
Merge branch 'maint-0.4.2' into release-0.4.2
2020-06-29 12:55:35 -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
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
6b08392152
Merge branch 'maint-0.4.2' into release-0.4.2
2020-05-06 16:58:12 -04:00
d46f67ef0e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-06 16:58:12 -04:00
633366efcd
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-05-06 16:58:12 -04:00
dd795fbee4
changes file for bug 34078.
2020-05-06 16:58:06 -04:00
21180862e0
Merge branch 'maint-0.4.2' into release-0.4.2
2020-05-04 10:25:52 -04:00
bbfc498e21
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-05-04 10:25:52 -04:00
d7e166bd95
Fix a GCC 10.0.1 compilation warning.
...
Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC
first gives this warning for 9eeff921ae
2020-04-30 22:56:31 -04:00
958f6eb5c7
Merge branch 'maint-0.4.2' into release-0.4.2
2020-04-09 11:03:30 +10:00
2d7e08d57e
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-04-09 11:03:27 +10:00
987f2fa50a
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-04-09 11:03:20 +10:00
d380acaeca
Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5
2020-04-09 11:02:49 +10:00
c22601765d
Merge branch 'maint-0.4.2' into release-0.4.2
2020-03-25 10:56:27 -04:00
048714d2ce
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-25 10:56:27 -04:00
26fd31fef8
Merge branch 'bug33673_035' into bug33673_041
...
Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.
2020-03-20 14:49:11 +10:00
Alexander Færøy
Nick Mathewson
David Goulet
Roger Dingledine
teor