Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8
commitce6f2d1c4da5125cdd4a69fcc4cd45f7c3d6ca8d
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 15:09:33 +0000 (12 11:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 15:09:33 +0000 (12 11:09 -0400)
treebedfabdf643926c0810a19b3bdb4cbb354a399f8
parentd00d3f1c2858f71adfa315ee67d0c2191a793d2a
parentb8b5bccfd9f350cd796a8bcd6b79b9d303a79e11
Merge remote-tracking branch 'arma/bug19003-try2' into maint-0.2.8