Merge branch 'maint-0.2.7' into maint-0.2.8
commiteca4a89319c566c0e320c7f713aed0f7e34330eb
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 15:39:13 +0000 (7 10:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 15:39:13 +0000 (7 10:39 -0500)
treeaffd1f7c93718da4aabe8f5e955300c6163b804e
parenta9f936d0d757c5628a8da0b88af4710b2f6d22fd
parent4bce2072acaca38d40086c943d8f332ed2c2cf50
Merge branch 'maint-0.2.7' into maint-0.2.8