Merge branch 'maint-0.2.8' into release-0.2.8
commitc4b7b4ad4ba35b724fa90012adafd62e48ed7e42
authorNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 12:29:52 +0000 (19 08:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 12:29:52 +0000 (19 08:29 -0400)
tree10286c710adc039b881a65b56d6a2547c2e49e61
parent1e97b6afc62388a6835d92c6fc9543cfa8caf964
parent7c7d990704219ff1033dc9dc257378757ad7cecf
Merge branch 'maint-0.2.8' into release-0.2.8