cMerge branch 'maint-0.2.8' into release-0.2.8
commitb5e2b3844ab3a1c9fe42d0c83e3e95705dee2900
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:27:35 +0000 (25 09:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:27:35 +0000 (25 09:27 -0400)
tree822820461abf92e19b4b3e5b01a72f26e19334de
parent0f80dd2a26333ee78a9698b4d3cf8079736f34b5
parentfdfc528f85c11a1d29b6a67e32180278d1ca7cbb
cMerge branch 'maint-0.2.8' into release-0.2.8