Merge branch 'maint-0.2.8'
commit7d410a6b0d462e0838c5fca2eec089693104a514
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 15:02:10 +0000 (24 11:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 15:02:10 +0000 (24 11:02 -0400)
tree16f9ad183c1d8bc3cff90e41a948431b574b7012
parente2ede7c9d5944c87eb4022eae0090cdfac2202b9
parent57ba7ab39a31e48b4a865a7e207237474f561905
Merge branch 'maint-0.2.8'