fix merge error in 'Package/plugin-gargoyle-tor