commit 366e9ba8425f602b978ffc1e8ba014913a2edd98 Merge: 79f929723 d7259b64d Author: Nick Mathewson <nickm at torproject.org> Date: Fri Jan 4 15:04:58 2019 -0500 Merge branch 'maint-0.3.4' into release-0.3.4