Merge branch 'maint-0.2.3' into release-0.2.3
commit5d672c1b71a88818c8043277c60a225fa1ba6eda
authorRoger Dingledine <arma@torproject.org>
Wed, 5 Sep 2012 00:15:58 +0000 (4 20:15 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 5 Sep 2012 00:15:58 +0000 (4 20:15 -0400)
tree20cea126e1381ce2d75da28189c6391344da8fde
parent0eaebaeb63daadd7be3d7accbdf4e8697dbe5b5c
parentacfd487e7dbf5fa1408a2bba7afff54bc7d0118e
Merge branch 'maint-0.2.3' into release-0.2.3