[tor-commits] [tpo/master] Merge branch 'update-membership' into 'master'