commit 837f11a5320872ff9ab3565c9e2ddc44f127e843 Merge: f53720219 de129e69b Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 7 20:15:50 2018 -0400
Merge branch 'maint-0.3.4'
"ours" merge to avoid version bump.
tor-commits@lists.torproject.org