commit 93c430cab3c2db8da91d76477468f68cb1e89fac Merge: d1a0f2e 74e84b7 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 8 07:55:53 2016 -0500 Merge branch 'maint-0.2.9' This is an "ours" merge to avoid bumping the version.