commit 4c939f89ae583008e07071c822abaf55435cb5f1 Merge: f36b3faa7 4748fd23d Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 24 09:13:37 2018 -0400 Merge branch 'maint-0.3.4' "ours" merge to avoid version bump.