Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5