commit 490cd038693b89c30b60fd8682fd631f5581f458 Merge: a9bfa99 cb2e205 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Dec 20 18:23:54 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9