Module tor2
merge conflicts