Merge branch 'maint-0.2.8' into release-0.2.8
commitf2824887e326e9fdc5f096f99d4dfe4aeee4d79a
authorNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 20:05:04 +0000 (19 16:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 20:05:04 +0000 (19 16:05 -0400)
tree42b85baec7b10abc16a107a9fbc8e24c1de9c621
parent945aa9931112c02f5e50594915509b471897684c
parent33841a60303ce8febf8180829a868dcc43924d77
Merge branch 'maint-0.2.8' into release-0.2.8