[tor-commits] [stem/master] Merging changes for sphinx documentation