Merge branch 'maint-0.2.7' into maint-0.2.8
commit459e5d705eb688642d53f38c00e0a2c6cfd36b8a
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Aug 2016 14:27:14 +0000 (12 10:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Aug 2016 14:27:14 +0000 (12 10:27 -0400)
tree17b22d068ec83fdc519c227aa1cba0e47c2fcbca
parent6b740aa46b513eaaa0d5b2dba0dce138e988e2a5
parentdb372addc8534dc6e4639fe943179943b276b051
Merge branch 'maint-0.2.7' into maint-0.2.8