Bug40168+34088 035 v3 master

Mike Perryrequested to merge
mikeperry/tor:bug40168+34088-035-v3-master into master

Merge commit from 035 in case issues require backport.

Merge request reports