commit 0ea508ec6f540f0c768d993df257a9733fac4074 Merge: 3c691613c 5acf6f871 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 13:01:53 2018 -0400
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" merge to avoid version bump.
tor-commits@lists.torproject.org