commit 2e219291bee2d378344286ba091ba09527b07188 parent ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 30 Nov 2017 12:21:36 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" to avoid version bump