Merge branch 'bug9200' into maint-0.2.4
commit7a4145c45aa0833af96cdb4b5c3fba90731c7037
authorNick Mathewson <nickm@torproject.org>
Mon, 8 Jul 2013 15:35:25 +0000 (8 11:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 8 Jul 2013 15:35:25 +0000 (8 11:35 -0400)
tree9c27e7b6629a83b3f1872b9e3f3d71225ad1e74e
parentc78c8de015ac62eb3fa529f932bcf86dae9f3d9d
parentb34279d3ab2bae2a1393427e0866da018cf8b678
Merge branch 'bug9200' into maint-0.2.4