Merge remote-tracking branch 'public/bug8788'
commit12954908623a285606ec7522168cd2ac7e799525
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Mar 2014 17:17:31 +0000 (5 12:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Mar 2014 17:17:31 +0000 (5 12:17 -0500)
tree230de9088fb58509168acc96b27cc6ae70ae7a58
parent27d231ca130b48e0963aaab7307109f7eafcc5c9
parent24add404ac08df59d0b5d68c6762b869bee63bac
Merge remote-tracking branch 'public/bug8788'