ATTN: The maint-0.2.2 branch has branched; master is now 0.2.3.x-alpha

Nick Mathewson nickm at
Fri Sep 24 19:16:43 UTC 2010

Hi, all!

I've just created a new "maint-0.2.2" branch[*] in the official Git
repository for work on Tor 0.2.2.x.  This may be overly optimistic of
me, but I think Tor 0.2.2.x is almost ready for rc status.[**]  Just a
couple more bugfixes!  (To see all bugs marked for 0.2.2.x on the
tracker, go to
and click on "Active Tickets".  Some are rc-blockers, but most

For more info on how we use git branches, see "How we use git
branches" in doc/HACKING.  The upshot is that bugfix branches should
be done on maint-0.2.2 (or maint-0.2.1 if they're serious and old
enough), and new-feature branches should be done on master.  Don't
worry if you have a branch that you started on the old master: It will
merge cleanly onto maint-0.2.2, since it started before the

[*] (There's also a release-0.2.2 branch. Almost nobody but Roger
should care about that one.  If you're curious about what it's for,
have a look at that section of doc/HACKING I mentioned.)
[**] Also, there are some deliverables we need to merge into an alpha
rsn in order to be contract-compliant, from what I understand.
[***] And if you screw up and base a bugfix branch on the new master,
don't worry.  Make a backup copy of the branch, then rebase it with
"git rebase --onto origin/maint-0.2.2 master", subject to the usual
rebasing caveats.


More information about the tor-dev mailing list