Merge branch 'maint-0.2.1' into maint-0.2.2
commitac7b6c508dca24a256abc30b4ecaf21019569a38
authorRoger Dingledine <arma@torproject.org>
Thu, 15 Sep 2011 20:34:47 +0000 (15 16:34 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 15 Sep 2011 20:34:47 +0000 (15 16:34 -0400)
treedef7db8677a35c9638109aa4bd0429231e5c4445
parent4a351b4b9ebfadf27d68e6bb3e1470cdef83ef45
parent679f617345dc31c46560b09d3b5d5d350e06ab23
Merge branch 'maint-0.2.1' into maint-0.2.2