commit a5c9ae8526f179e588dc9de73a5c89ffaca70ad8 parent 5a22b42c3a01ad8d99e977cfd9efa760438129e9 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 18 Dec 2018 08:04:23 -0500 Merge branch 'maint-0.3.5' Use "git merge -s ours" to avoid a version bump.