Merge branch 'maint-0.3.4' into release-0.3.4
commit85526a5a1f82eba726ba37e47954e16f6b753699
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:02:39 +0000 (3 09:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:02:39 +0000 (3 09:02 -0500)
tree3d3260f8847f98e191be0a2956b429969eed245d
parentdaf79d4b2a5f46ae4ffbdee7b39c504ccce33d6c
parent3e64553f769a4d2536c9f0ac0ad289cf9c41826d
Merge branch 'maint-0.3.4' into release-0.3.4