[tor-commits] [bridgedb/master] Merge branch 'feature/cleanup-config' into develop