Merge branch 'maint-0.2.8' into release-0.2.8
commitb74ce86830ca742f994e348c4bb4aed40ac81662
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Jun 2016 16:23:00 +0000 (14 12:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Jun 2016 16:23:00 +0000 (14 12:23 -0400)
tree5c482ffc29060da1f7868f9babc1919a2b4a0bb4
parent1dbb5aac89fe43f81622cd59465ac87fb5880cca
parent71aacbe427e2d0c2b970bdc81db4f96c506dd7f3
Merge branch 'maint-0.2.8' into release-0.2.8