commit 3d47438b84102e6831c0905764cb96d479e4580a Merge: 729ad3b 707cf3d Author: Georg Koppen <gk@torproject.org> Date: Mon Feb 19 12:06:56 2018 +0000 Merge remote-tracking branch 'boklm/bug_25178' projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)