commit ff2b7ae1f3f6066c501b1c4099e3d20dd0533acb Merge: bff3c6f48d 2f87b2ab75 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Nov 23 14:04:05 2020 -0500 Merge branch 'maint-0.4.5' into master "ours" to avoid version bump.