[tor-commits] [sbws/master] Merge branch 'ticket27918_arg_types'