[tor-commits] [bridgedb/develop] Merge branch 'bug23894' into develop