5
0
mirror of https://github.com/cwinfo/yggdrasil-public-peers.git synced 2024-11-28 22:31:40 +00:00
Commit Graph

489 Commits

Author SHA1 Message Date
Neil Alexander
4cb3f884b6
Update poland.md 2021-10-12 16:15:43 +01:00
Neil Alexander
2f9199b73b
Update netherlands.md 2021-10-12 16:15:17 +01:00
cofob
e4d5a65c00
Update russia.md 2021-10-02 15:16:48 +07:00
pvsur
be852b8199
Update russia.md 2021-09-21 10:45:52 +03:00
phrl42
fdf9a12653
Update germany.md
consider adding my node, thank you very much
2021-09-06 12:41:28 +00:00
Christer Warén
fbb3bb2f11
[New Peer] – Tuusula, Hetzner, operated by cwinfo and cwchristerw
fi1.servers.devices.cwinfo.net
2021-08-14 14:12:15 +03:00
Incognify
6f1cc64519
Update netherlands.md
Added Netherlands based peer in Naaldwijk.
2021-08-13 20:08:51 -04:00
TomZ
17733632a4 Update IPv6 address 2021-08-04 20:21:46 +02:00
Daki Carnhof
b36d22b937
Update czechia.md: tls-only host 2021-08-03 20:49:44 +02:00
Neil Alexander
437de37192
Merge pull request #273 from r4sas/patch-1
[fr] update R4SAS peer ipv4, add domain as fallback
2021-08-01 09:51:17 +01:00
Neil Alexander
c8d2f2a28a
Merge pull request #274 from gennadykataev/patch-3 2021-07-31 08:10:37 +01:00
gennadykataev
14bd62b011 Change peer's port 2021-07-31 09:43:10 +03:00
R4SAS
83a9582978
[fr] update R4SAS peer ipv4, add domain as fallback 2021-07-30 07:43:11 +03:00
Neil Alexander
cf34aa2d49
Merge pull request #272 from gennadykataev/patch-2
Add public peer in russia.md
2021-07-29 09:13:44 +01:00
gennadykataev
3b622a2e8d Add public peer in russia.md 2021-07-29 10:36:33 +03:00
Neil Alexander
9fd2d15b71
Merge branch 'master' into patch-1 2021-07-28 23:02:56 +01:00
gennadykataev
695e3d76e0 Add new Ukraine peer 2021-07-28 13:50:45 +03:00
Incognify
a7f61d77c1
Update finland.md
Added peer
2021-07-27 03:48:02 -04:00
Fyodor Ustinov
79ae8d2693
Update ukraine.md
add peer in Bila Tserkva
2021-07-26 06:23:36 +03:00
Neil Alexander
9c3ee3aecb Clean up long-dead and/or the majority of v0.3 nodes 2021-07-25 09:35:13 +01:00
Eugene Lisovsky
c76ad813cd add public node to RU list 2021-07-21 12:25:35 +07:00
Christer Warén
1ad9b15340
[New Peer] – Tuusula, Hetzner, operated by warengroup and cwchristerw
aurora.devices.waren.io
2021-07-20 03:56:46 +03:00
Christer Warén
e4791bcf1a
[Peer Update] – Tuusula, Hetzner, operated by cwinfo and cwchristerw
fi1.servers.devices.cwinfo.net
2021-07-20 03:50:01 +03:00
Christer Warén
642f95af5c
[New Peer] – London, OVH, operated by cwinfo and cwchristerw
uk1.servers.devices.cwinfo.net
2021-07-20 03:09:28 +03:00
Christer Warén
9cfc351051
[Peer Update] – Warsaw, OVH, operated by cwinfo and cwchristerw
pl1.servers.devices.cwinfo.net
2021-07-20 03:01:59 +03:00
Christer Warén
c2f297e418
[Peer Update] – Gravelines, OVH, operated by cwinfo and cwchristerw
fr2.servers.devices.cwinfo.net
2021-07-20 02:59:05 +03:00
Christer Warén
75b29b5bb6
[Peer Update] – Strasbourg, OVH, operated by cwinfo and cwchristerw
cloudberry.fr1.servers.devices.cwinfo.net
2021-07-20 02:58:15 +03:00
TomZ
f27b3a0c70 Add one 2021-07-12 11:53:53 +02:00
Maciej Krüger
d145f6177c
Add ygg.mkg20001.io 2021-07-11 04:26:41 +02:00
cathugger
a8791a118c
Merge pull request #251 from TomasGlgg/patch-1
Update russia.md & add I2P node
2021-07-09 15:41:07 +00:00
cofob
85d2601735
Update russia.md 2021-07-09 03:05:56 +07:00
cofob
e372d318ed
Update germany.md 2021-07-09 03:02:55 +07:00
cathugger
1c0cd19444
Merge pull request #249 from SolSoCoG/patch-1
Update germany.md
2021-07-08 16:43:26 +00:00
Neil Alexander
f999d04c84
Merge branch 'master' into patch-3 2021-07-08 11:46:48 +01:00
Neil Alexander
24e4cb667e
Merge pull request #262 from AleksdemSA/patch-1
Update russia.md
2021-07-08 11:44:25 +01:00
Neil Alexander
ca6b623ed7
Merge pull request #250 from cofob/patch-2
Update germany.md
2021-07-08 11:44:16 +01:00
Aleksey
305bde63e4
Update russia.md 2021-07-08 13:15:01 +03:00
cofob
b3bc89ccbb
Update germany.md 2021-07-08 15:35:00 +07:00
acetone
514542867f
add Meppel peer 2021-07-05 11:04:44 -04:00
Nikat
d272fa99c9
Update russia.md 2021-07-05 01:01:52 +03:00
rany
1ac06d43ca Remove pinning so peer works after v0.4.0 2021-07-05 00:17:21 +03:00
TomasGlgg
614a771d39
Add keys 2021-07-04 20:11:26 +03:00
Andrei Tregubov
1e2d3eb1db Removed Netherlands peer 2021-07-04 13:16:54 +03:00
Arceliar
5d926dfe16
remove pinned key, status page dislikes it 2021-07-03 23:40:16 -05:00
Arceliar
4441397387
Update france.md 2021-07-03 17:44:30 -05:00
Neil Alexander
61527b7dca
Update netherlands.md 2021-07-01 21:19:29 +01:00
vaultec
2b5bfcb815
Create Sweden, add server 2021-06-24 12:15:44 -07:00
TomasGlgg
c6d08e7fbf
Change contact URI 2021-06-22 17:52:14 +03:00
cofob
6f393b0dde
Update germany.md 2021-06-15 21:40:27 +03:00
SolSoCoG
309d834900
Update germany.md 2021-06-11 15:44:19 +02:00
Kesha
bd732abce9
Update russia.md 2021-06-07 21:02:15 +06:00
cathugger
0489d64bb2
Merge pull request #245 from rnbunker/master
Added my node
2021-06-07 13:49:07 +00:00
cathugger
676bb3a97c
Merge pull request #244 from averyanalex/patch-6
Update averyanalex node
2021-06-07 13:48:24 +00:00
rnb
27e7cd3728 Added node 2021-06-02 21:32:36 +02:00
Александр Аверьянов
b268a17a58
It is a home node 2021-05-24 16:02:18 +03:00
Александр Аверьянов
252bb0594d
Update averyanalex's node
Now I am using r pi 4 as home server, no IP changes planned in a near future.
2021-05-24 16:00:23 +03:00
Panov Paul
f150646873
Add public peer in russia.md 2021-05-23 07:12:03 +03:00
cathugger
8f3da0671d
Merge pull request #242 from shurale/edit-list
Add public peer in russia.md
2021-05-13 20:05:17 +00:00
Shura Shuracov
44f4b26e39 Add public peer in russia.md 2021-05-12 13:21:01 +03:00
cofob
ad04d8fb96
Update germany.md 2021-05-02 12:18:20 +07:00
cathugger
b178e158a5
Merge pull request #240 from tolstoevsky/patch-14
Update germany.md
2021-04-24 12:07:45 +00:00
cathugger
b1239d442c
Merge pull request #238 from adraenwan/master
add tfnux.org (totem & mercury)
2021-04-24 12:07:15 +00:00
Tolstoevsky ( ✡ RMS Supporter )
1038641a65
Update germany.md 2021-04-21 17:43:27 +00:00
Christer Warén
4be678e138
[New Peer] – fi1.servers.devices.cwinfo.net
Tuusula, Hetzner, operated by cwinfo and cwchristerw
2021-04-14 15:30:46 +03:00
Christer Warén
ea3b43763b
[Peer Removal] – fr2.servers.devices.cwinfo.net
Strasbourg, OVH, operated by cwinfo and cwchristerw
2021-04-14 15:19:23 +03:00
Babz
023612c794 add mercury.tfnux.org 2021-04-05 18:46:43 +02:00
Babz
bb40253d9c add totem.tfnux.org 2021-04-05 18:46:26 +02:00
Iczelion
76855930d4 Del belarus.md 2021-04-03 14:24:13 +03:00
cathugger
d628a3e571
Merge pull request #234 from tolstoevsky/patch-13
Create romania.md
2021-03-19 22:31:12 +00:00
cathugger
bb64b3e87b
fix fix 2021-03-19 22:30:49 +00:00
cathugger
694eb333d1
fix formatting and style 2021-03-19 22:30:18 +00:00
tolstoevsky
60fbd4e9bc
Create romania.md 2021-03-19 09:22:15 +00:00
tolstoevsky
0585f4eb32
Update germany.md 2021-03-19 08:39:33 +00:00
cathugger
a60a830fef
Merge pull request #232 from r4sas/patch-1
Add back ipv6 addresses at R4SAS France node
2021-03-13 17:19:34 +00:00
cathugger
16157cda2c
Merge pull request #230 from Darwinkel/patch-1
Update germany.md
2021-03-13 17:19:10 +00:00
R4SAS
a5ceae7357
Add back ipv6 addresses at R4SAS France node 2021-03-12 18:48:58 +03:00
eugene martein
759d3c9055 Add belarus.md 2021-03-07 14:53:19 +03:00
Darwinkel
5de4223e74
Update germany.md 2021-03-05 09:50:26 +00:00
cathugger
1b1dd07774
Merge branch 'master' into master 2021-02-27 12:36:58 +00:00
cathugger
6baf6f1997
Merge branch 'master' into patch-2 2021-02-27 12:31:31 +00:00
Neil Alexander
dd966ed8b3
Merge pull request #229 from tolstoevsky/patch-11
Update germany.md
2021-02-22 22:12:49 +00:00
tolstoevsky
e1fc8475b3
Update germany.md 2021-02-22 19:38:28 +03:00
tolstoevsky
7d1f3e1aab
Update russia.md
Nizhniy Novgorod down again. Hardware issues.
2021-02-22 19:35:41 +03:00
Alexander Ivanov
bf1ce312dc
Update russia.md 2021-02-17 16:01:56 +08:00
Alexander
5a26f54c81
Update germany.md 2021-02-08 14:25:30 +03:00
Alexander Ivanov
5d7a20bbb7
Update russia.md 2021-02-07 15:19:05 +08:00
cathugger
67c5a9466b
Revert "czechia.md: Remove one node in Prague"
This reverts commit db5d9c6c37.
Updates #224.
2021-01-14 00:08:04 +00:00
cathugger
5af110e775
Merge pull request #224 from carnhofdaki/master
czechia.md: Remove one node in Prague
2021-01-13 11:11:07 +00:00
cathugger
727fab9d5b
Merge pull request #223 from averyanalex/patch-5
Update russia.md
2021-01-13 11:10:40 +00:00
cathugger
082b9173f8
Merge pull request #219 from TomasGlgg/patch-6
Update node
2021-01-13 11:04:56 +00:00
Daki Carnhof
db5d9c6c37
czechia.md: Remove one node in Prague
There was recently too much traffic reported. So turning it off.
2021-01-12 13:59:07 +01:00
Александр Аверьянов
102aeac933
Update russia.md 2021-01-12 13:53:06 +03:00
Amir
c343ed6cfd
update my contact info 2021-01-10 11:35:23 +03:00
Nikat
e5604af2f5
Update russia.md
DNS records update
2021-01-09 16:31:39 +03:00
TomasGl
4e2bde6d72
Update node 2021-01-03 23:39:18 +03:00
Alexander Ivanov
b2708db61b
Updated europe/russia.md 2020-12-02 22:01:27 +08:00
Paweł Krawczyk
bdb25db423
Webcookies nodes are decommissioned 2020-11-28 11:53:23 +00:00
Christophe de Carvalho
43946f172f
Change maintainer of the Belgium nodes 2020-11-27 18:14:49 +01:00
Aleksey
7316968f0c
Update russia.md
К сожалению, сервер больше не будет работать и удаляю его из списка. За эти годы работы, надеюсь, он был полезен. Удачи, парни! :)
2020-11-08 12:41:08 +03:00
Neil Alexander
13d3bc26a2
Merge pull request #213 from samip5/master
Finland: Discontinued Helsinki node
2020-11-05 09:17:13 +00:00
Skyler Mäntysaari
44f2b9f76f
Update finland.md 2020-11-05 01:50:20 +02:00
David Hoppenbrouwers
64e5b7948e
Add luxembourg.md 2020-10-24 23:33:36 +02:00
Dmitrii
1a6adcf6fc
Update russia.md 2020-10-20 17:03:23 +03:00
Amir
433df44daf
domain change 2020-10-15 18:20:14 +03:00
Neil Alexander
b6f8b2e54b
Revert "Delete moldova.md"
This reverts commit 0ad3e31f3f.
2020-10-04 22:20:01 +01:00
Nikat
21fb2bf992
Update russia.md 2020-09-30 20:39:53 +03:00
Nikat
5c75c19e31
Update russia.md 2020-09-30 20:33:23 +03:00
Christer Warén
ed8ff7b298
[Peer Update] – Strasbourg, OVH, operated by cwinfo and cwchristerw (#206) 2020-09-30 08:33:23 +01:00
tolstoevsky
4743001b3f
Update russia.md
NN node is back
2020-09-28 16:12:45 +00:00
Vadym Vikulin
ba8c55e1b7
Update ukraine.md
Removed my peer which I can not continue to support
2020-09-16 22:02:44 +03:00
TomasGl
76d76e7361
Update russia.md (#202) 2020-09-13 13:57:57 +01:00
tolstoevsky
0b9ed91a08
Update russia.md (#201)
NN node is going down
2020-09-13 13:57:40 +01:00
Nikat
7d5499564a
Update russia.md
Add one more node
2020-09-08 09:07:35 +00:00
Vadym Vikulin
27b73ad24e
Update ukraine.md 2020-09-05 20:43:39 +03:00
Christer Warén
6a8a69dbb7 Changed ports – cloudberry.fr1.servers.devices.cwinfo.net 2020-09-01 17:01:59 +03:00
TomasGl
92f01883ef
Update russia.md 2020-08-29 19:41:14 +03:00
Aleksey
0cc1a46e1f
Update russia.md
added tls://194.177.21.156:5068
2020-08-28 00:48:23 +03:00
cathugger
62d6a5a089
Merge pull request #192 from mvvpt/patch-3
Update ukraine.md
2020-08-18 19:07:00 +00:00
mvvpt
998cb5442c
Update ukraine.md 2020-08-11 11:17:17 +03:00
Coma Grayce
11b3c5182b
Update ukraine.md 2020-08-11 03:11:15 +03:00
mvvpt
fe16d370d7
Update ukraine.md 2020-08-10 18:46:13 +03:00
abslimit
deea5ff677
added to netwhood tls method 2020-08-09 20:03:43 +03:00
Skyler Mäntysaari
087bd10546 Finland: Moved provider and added a new peer 2020-08-09 00:42:05 +03:00
mvvpt
c53ee0f7a3
Update ukraine.md 2020-08-06 18:10:22 +03:00
Neil Alexander
01f2b03377
Merge pull request #182 from loskiq/patch-1
Update russia.md
2020-08-05 13:46:54 +01:00
Neil Alexander
46b4e3bbd0
Merge pull request #183 from tolstoevsky/patch-5
Update germany.md
2020-08-05 13:46:41 +01:00
Neil Alexander
798fa50eaf
Update germany.md 2020-08-05 13:46:35 +01:00
Neil Alexander
775c985ce1
Merge pull request #184 from tolstoevsky/patch-6
Update russia.md
2020-08-05 13:46:16 +01:00
Timur Demin
94d4993129
Add TLS to Ufa node 2020-08-04 00:53:04 +05:00
Timur Demin
d3de5a01a2
Add Ufa public node 2020-08-04 00:04:03 +05:00
tolstoevsky
50fca7f6de
Update russia.md 2020-08-02 18:14:26 +03:00
tolstoevsky
e972882489
Update germany.md 2020-08-02 18:13:48 +03:00
Amir
ae0d301303
Update russia.md 2020-08-02 15:56:12 +03:00
Александр Аверьянов
fbe75e6e19
Update russia.md 2020-07-26 22:15:54 +03:00
vikulin
461a771a87
Update ukraine.md 2020-07-04 01:32:41 +03:00
Neil Alexander
092c6e57b5
Update russia.md 2020-07-03 08:52:44 +01:00
dimka511
8505af4fcb
Create ukraine.md 2020-07-01 14:52:38 +03:00
Christophe de Carvalho
e4b5c636b0
Create belgium.md 2020-06-27 12:06:13 +02:00
Skyler Mäntysaari
5f9fac51fb finland.md: Corrected typo and changed to DNS. 2020-06-22 04:14:59 +03:00
Skyler Mäntysaari
f23ca7f31d
Update finland.md 2020-06-22 03:03:18 +03:00
Skyler Mäntysaari
4b89d6f850
Create finland.md 2020-06-22 02:50:59 +03:00
Neil Alexander
984549e52c
Merge pull request #164 from cwinfo/tls-support
Added TLS Support - cwinfo.net
2020-06-21 22:16:14 +01:00
Neil Alexander
5ab1438b78
Merge branch 'master' into patch-1 2020-06-21 22:15:13 +01:00
Neil Alexander
bce8cb0fbf
Update switzerland.md 2020-06-21 09:32:36 +01:00
Neil Alexander
228a4d76e4
Update united-kingdom.md 2020-06-21 09:32:22 +01:00
Neil Alexander
7c8e15fb8f
Delete ukraine.md 2020-06-21 09:22:18 +01:00
Neil Alexander
9a424fd172
Delete spain.md 2020-06-21 09:22:10 +01:00
Neil Alexander
50beea0c61
Update russia.md 2020-06-21 09:21:36 +01:00
Neil Alexander
d1fa6798e4
Delete romania.md 2020-06-21 09:21:04 +01:00
Neil Alexander
5cd9efd015
Update poland.md 2020-06-21 09:20:52 +01:00
Neil Alexander
748ee00a3e
Update netherlands.md 2020-06-21 09:20:30 +01:00
Neil Alexander
0ad3e31f3f
Delete moldova.md 2020-06-21 09:20:06 +01:00
Neil Alexander
294b07055b
Update germany.md 2020-06-21 09:19:50 +01:00
Neil Alexander
8ea9dd2a49
Update france.md 2020-06-21 09:18:55 +01:00
Neil Alexander
a73ff2558f
Delete bulgaria.md 2020-06-21 09:17:20 +01:00
Neil Alexander
9e94401577
Update russia.md 2020-06-21 09:14:01 +01:00
TomasGl
5784831886
Added Moscow node 2020-06-19 02:07:10 +03:00
Neil Alexander
eb68e183b4
Add norway 2020-06-14 21:19:34 +01:00
Neil Alexander
8c7064d297
Revert "Merge pull request #146 from rany0/patch-3"
This reverts commit 4b0c10347f, reversing
changes made to f4c806ebbc.
2020-06-13 22:35:07 +01:00
Neil Alexander
9778d28f94
Update united-kingdom.md 2020-06-13 21:54:30 +01:00
Neil Alexander
bebe635440
Delete finland.md 2020-06-12 10:26:24 +01:00
Neil Alexander
bd846e3588
Delete sweden.md 2020-06-12 10:24:22 +01:00
Christer Warén
092f53d3a0
Added TLS Support - pl1.servers.devices.cwinfo.net 2020-05-26 17:29:21 +03:00
Christer Warén
aac5679e01
Added TLS Support - cwinfo.net
cloudberry.fr1.servers.devices.cwinfo.net
fr2.servers.devices.cwinfo.net
2020-05-26 17:27:38 +03:00
Alexander Ivanov
77042b8937
add(russia.md): Added Novosibirsk peer 2020-05-17 02:40:55 +08:00
Alexander Ivanov
51ffb9902d
add(russia.md): Irkutsk node + cleanup 2020-05-03 17:55:01 +08:00
Christer Warén
08616b231f
Removed peer - fi1.servers.devices.cwinfo.net
- Ulvila, Tavu Cloud, operated by cwinfo and cwchristerw
2020-04-30 14:00:15 +03:00
Christer Warén
234ae85c89
Removed peer - de1.servers.devices.cwinfo.net
- Limburg, OVH, operated by cwinfo and cwchristerw
2020-04-30 13:59:20 +03:00
cathugger
d3ab26e340
Merge pull request #157 from tolstoevsky/patch-4
Update germany.md
2020-04-13 13:54:56 +00:00
tolstoevsky
e6a697e591
Update germany.md 2020-04-06 10:47:51 +03:00
tolstoevsky
158b664fde
Update netherlands.md
node moved to Germany
2020-04-06 10:46:40 +03:00
cathugger
ef44388d9a
Merge pull request #155 from SlyderBY/master
Changing IP addresses for the Pinatek host
2020-04-03 16:07:27 +00:00
Sergey Dovnar
ecd7f0e236
Merge branch 'master' into master 2020-03-29 18:25:49 +03:00
Sergey Dovnar
5ce963cc51 Changing IP addresses for the Pinatek host 2020-03-29 17:20:17 +02:00
Stanislav N. aka pztrn
a2582d9485
Updated IPv6 address of my public node. 2020-03-29 13:18:42 +05:00
Jan Christian Grünhage
d2c50acf25
add IPv6 for IONOS Baden-Baden peer 2020-03-18 12:30:38 +01:00
Jan Christian Grünhage
fe23025503
removed jcgruenhage's ovh vps
The vps is gone, didn't use it enough to justify the cost.
2020-03-18 12:01:29 +01:00
deb5080
f17e8be9c0
node added 2020-03-16 11:34:33 +01:00
R4SAS
933f45af02
cleanups (pagination, spaces, newlines)
Signed-off-by: R4SAS <r4sas@i2pmail.org>
2020-03-09 01:58:34 +03:00
R4SAS
0affd823f5
add s2.i2pd.xyz node (fr, i2p)
Signed-off-by: R4SAS <r4sas@i2pmail.org>
2020-03-09 01:57:02 +03:00
cathugger
4b0c10347f
Merge pull request #146 from rany0/patch-3
Update france.md
2020-03-04 17:10:37 +00:00
Rany
7b05b1eddc
Update france.md 2020-03-04 17:23:44 +02:00
Rany
ee8d760c21
remove box1.rany.eu.org
moved to france
2020-03-01 22:02:57 +02:00
cathugger
af5a9bf25d
Merge pull request #143 from kravietz/master
Add new WebCookies nodes
2020-02-15 11:11:51 +00:00
alikates
a43f074229 Addedd spain.md 2020-02-10 10:34:28 +01:00
Pawel Krawczyk
31f8f4acf0 Add new WebCookies nodes 2020-02-06 14:59:28 +00:00
ne-vlezay80
90d2c2e79c
Update russia.md 2020-02-04 15:43:46 +03:00
ne-vlezay80
a532ed1389
fix port number 2020-02-03 18:07:06 +03:00
cathugger
46b3c9b0be
Merge pull request #141 from rany0/patch-1
Update united-kingdom.md
2020-01-31 17:45:21 +00:00
Rany
be3b7b4553
Update united-kingdom.md 2020-01-31 15:53:39 +02:00
Rany
79e2b8a181
Update united-kingdom.md 2020-01-31 15:52:38 +02:00
Casperpor
f4fee66312
Update russia.md
Sevastopol peer temporary offline
2020-01-28 18:38:37 +03:00
opal hart
60312f61c8
Add Tor and Europe/Moldova peer 2020-01-22 18:44:28 +02:00
cathugger
92e6227377
Merge pull request #138 from abslimit/patch-3
Deleted depricated Scaleway node
2020-01-07 12:14:19 +00:00
abslimit
9040f48936
Added OVH hosting node 2020-01-07 13:02:41 +03:00
abslimit
a0f716d5e6
Deleted depricated node 2020-01-07 13:01:01 +03:00
Daki Carnhof
0559f03899 czechia.md: Another host up 2019-12-03 22:26:35 +01:00
George
1b3337aee8 Remove Medium peers since the project is closed by Podivilov 2019-11-29 10:15:28 -05:00
Dmitrii
154947ae0a
Update russia.md
added tls
2019-11-18 22:31:19 +03:00
cathugger
a02b814610
Merge branch 'master' into patch-2 2019-11-15 05:20:18 +00:00