commit 229bd55f79d69b90e3d4ac618ca163314b3a990c Merge: fefb117 946d493 Author: Georg Koppen <gk@torproject.org> Date: Mon Feb 19 15:03:17 2018 +0000 Merge remote-tracking branch 'boklm/bug_24341' into bug_25000 projects/common/runc-config.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)