Merge branch 'maint-0.2.8'
commit20136a8207f0cda0d23093a884caae0358f98bac
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 18:46:27 +0000 (24 14:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 18:46:27 +0000 (24 14:46 -0400)
tree334c468a51ea7851d423740eb302aa43354095ff
parent7be7f42d459bc95c3451cb2a5393b8b6d1123eeb
parente9124b8cc76e247ea2a581b33af942729e250b8d
Merge branch 'maint-0.2.8'