Merge remote-tracking branch 'public/bug17047'
commitc84f3c917735caf073ee97935687c1ba8ee3639e
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Sep 2015 12:46:13 +0000 (16 08:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Sep 2015 12:46:13 +0000 (16 08:46 -0400)
tree27b538bcda057e96ec6d87925fd969b34cc82c91
parentb257e34583d428dc0f9b6f06ca3f470e794ab513
parent902517a7c03ec5a879190903f65fafc62c0b1613
Merge remote-tracking branch 'public/bug17047'