Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4
commit882893c8c3657be66b48580aa972e71dac25da5e
authorNick Mathewson <nickm@torproject.org>
Thu, 8 May 2014 03:04:48 +0000 (7 23:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 May 2014 03:04:48 +0000 (7 23:04 -0400)
tree5875d47db60d130be718ee30d148f0eb9f860a09
parent894c8b22662131817e5d7383740b2b285f9b7491
parentbd3db82906a2efcd678b5f4b61fef26c93828777
Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4