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