[tor-commits] [community/develop] Merge commit '0a622f691b17b36394b3cf5e340060c99226f935' into develop