Merge remote-tracking branch 'dgoulet/bug15254_027_01'
commitf273295cadd1afe03c0e839ce51f0d00bf2b43d6
authorNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 13:05:55 +0000 (2 09:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 13:05:55 +0000 (2 09:05 -0400)
tree2b174a785224739e6d8d834867cf81d9dab4c1f9
parentdb5a9302c17b5bed91987fdeaaa0377e46e4811e
parentd40358d91ed62590a84730fb2713b8a0115c5adf
Merge remote-tracking branch 'dgoulet/bug15254_027_01'