Merge "Add tor agents support for OC 4.X version" into release/2019.2.0