Merge branch 'maint-0.2.8'
commit06d99aa2c42de6013b3fa55ac03c661f57f90047
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Sep 2016 23:29:17 +0000 (20 19:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Sep 2016 23:29:17 +0000 (20 19:29 -0400)
tree465509b6e5a61f6fd0f2570a08136df775ea3ff3
parent32926b008b6c2a95966c6307ca4f1c920c920d44
parent19a9872be2e91e367b85795186c29a077223e91e
Merge branch 'maint-0.2.8'