Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-05-04 17:21:44 -04:00
commit 699af20e9a

View File

@ -474,7 +474,10 @@ in their approved versions list.
and push the git tag. and push the git tag.
(That's either "git tag -u <keyid> tor-0.2.x.y-status", then (That's either "git tag -u <keyid> tor-0.2.x.y-status", then
"git push origin tag tor-0.2.x.y-status". To sign the "git push origin tag tor-0.2.x.y-status". To sign the
tarball, "gpg -ba <the_tarball>") tarball, "gpg -ba <the_tarball>". Put the files in
/src/www-master.torproject.org/htdocs/dist on vescum, then
sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed
)
8) Edit include/versions.wmi to note the new version. Rebuild and push 8) Edit include/versions.wmi to note the new version. Rebuild and push
the website. the website.