[tor-commits] [goptlib/master] Merge branch 'bug15240'