Merge branch 'maint-0.2.8' into maint-0.2.9
commit52cb1edda69b7f73b2aa7a8edfbc850a0b3769ff
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Dec 2016 15:05:44 +0000 (1 10:05 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Dec 2016 15:05:44 +0000 (1 10:05 -0500)
tree6485cececc71e53b37f9d4004b56d004aef27ef6
parentf8a7972b29b83c08c64a8bc04a19c2ef33f50ccb
parent16fcbd21c963a9a65bf55024680c8323c8b7175d
Merge branch 'maint-0.2.8' into maint-0.2.9
configure.ac