commit 2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a Merge: e103509 ec1bc8a Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 26 13:57:51 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: changes/bug5090 bug5090 was already merged and corrected in the master branch's changelog.