Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9
commit87c000d19e40d97561076d043fdaa778bd48c124
authorNick Mathewson <nickm@torproject.org>
Mon, 12 Dec 2016 01:40:01 +0000 (11 20:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 12 Dec 2016 01:40:01 +0000 (11 20:40 -0500)
treecd3ded91ac5094a9e1ad70a65d5ccbb811c65b3b
parenta40d2123834cd55e77ed76684a6d0f536a7c2f4e
parentf3c040e33e8d12c62794db48c33799b43a86864a
Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9