Merge branch 'bug7065_v2' into maint-0.2.4
commit72c651ebdd64d28e0bfe640e37979b84f524abad
authorNick Mathewson <nickm@torproject.org>
Wed, 27 Mar 2013 02:20:08 +0000 (26 22:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 27 Mar 2013 02:20:08 +0000 (26 22:20 -0400)
treecb7c85730eba019f9fcc27d1dcdf31148ac15dfc
parent8b6a952c94bbc7bd3a9dc3356e708654092e08af
parent4cc7cc28f8040b3a8f3faaca82abe27bbec0b744
Merge branch 'bug7065_v2' into maint-0.2.4