Merge branch 'maint-0.3.3' into maint-0.3.4
commit658171318f67dd83ee115044cbf103325951a174
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Aug 2018 16:33:20 +0000 (24 12:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Aug 2018 16:35:23 +0000 (24 12:35 -0400)
treee4fcb07916a134b9773d687bfc6acf162ba5a563
parentdd27e17cccc139d55433b313ffee1030cb0cba9f
parent33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge branch 'maint-0.3.3' into maint-0.3.4
src/or/dirauth/dirvote.c