[tor-commits] [donate-static/staging] Git merge changes from staging