Merge branch 'bug21394_029_redux' into maint-0.2.9
commit73de7b4bcb9b85a02f0bb7e75620dc6bffbdc75e
authorNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 20:04:54 +0000 (4 15:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 20:04:54 +0000 (4 15:04 -0500)
tree92395333d311a908fe8bcd88298a92dec223d91b
parent3b5188576f7cbf20284a9f6e292fd2951504242f
parent06484eb5e19081f478c0c5569e2de6fcfb8d3531
Merge branch 'bug21394_029_redux' into maint-0.2.9