[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'tpo-sysrqb/bug9264_rebased_3_r1' into develop