commit b5bc84d5eed5c8db78e5c58dcc2b4b966b8a08ca Merge: 176e122 f85c561 Author: Roger Dingledine <arma at torproject.org> Date: Wed Oct 26 17:14:56 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2