[tor-commits] [bridgedb/master] Merge branch 'fix/9013_r1' into develop