Merge branch 'maint-0.2.3' into release-0.2.3
commit36801ba3c0c6a08e138cb09ecd7720a0ff711483
authorRoger Dingledine <arma@torproject.org>
Tue, 23 Oct 2012 21:26:21 +0000 (23 17:26 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 23 Oct 2012 21:26:21 +0000 (23 17:26 -0400)
tree079a9c0a3041b40cd25aa2b734529187a4db1084
parent3a2b86ef5d576e55defb3a9a1e37bee48b7b3d6a
parent2ecee3fce2179c6fe9f9c748522e417b887ee021
Merge branch 'maint-0.2.3' into release-0.2.3