[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop