commit 026dd67289580ff00b31f6c7c26328a9d2ecefed Merge: 44a18de d84dcba Author: Nicolas Vigier boklm@torproject.org Date: Thu Apr 9 22:48:52 2020 +0200

Merge remote-tracking branch 'JeremyRand/stem-1.8.0'

projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)