Merge branch 'maint-0.4.0' into maint-0.4.1
commitce89fe36c8d5e6210a2418430c91c3df03d86bdc
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Jun 2019 14:17:18 +0000 (11 10:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Jun 2019 14:17:18 +0000 (11 10:17 -0400)
tree1fca29952693b5c5ef21e75ceab63dc73a088393
parent29842f68e7a4f38d69509191fba9a7ffb28cdcd8
parentafa2c39baa61777b7f5bdfed28efe2ac5087dc4b
Merge branch 'maint-0.4.0' into maint-0.4.1