[tor-commits] [bridgedb/master] Merge branch 'hotfix/9264_2_rtl-2step' into develop