From: korgoth1 <vladislav.stakhov@gmail.com>
Date: Thu, 25 Jun 2020 19:41:41 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 2.6~286^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3413%2Fhead;p=thirdparty%2Frspamd.git

Merge remote-tracking branch 'upstream/master'
---

3396fddc22d38730ececc26fbdbab0c1d0445a26