[tor-commits] [oonib/master] Merge branch 'fix/application_api_rebase'