[tor-commits] [orbot/master] Merge branch 'bitmold-compile_erorr+refactor'