Merge remote-tracking branch 'dgoulet/bug20629_030_01'
commitded58777c5332a343a4f427058c56a2e28f440ab
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2016 01:12:13 +0000 (17 20:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2016 01:12:13 +0000 (17 20:12 -0500)
tree4cf7e487cf6dc91bd92e29cd70f2e4566f28b2aa
parentb5d738e4819813569bcb768d176fc1e23a7c0a21
parentc82881a235a686b84ad78d076826f832e3363184
Merge remote-tracking branch 'dgoulet/bug20629_030_01'