Merge branch 'bug15582_029' into maint-0.2.9
commit3138fe2e694a7036d28427ee3d76e639d15e4bc0
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Sep 2017 21:09:42 +0000 (12 17:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Sep 2017 21:09:42 +0000 (12 17:09 -0400)
treeaa5caef0034033a662c43793178298d128a574d7
parentbac160b4e079398d82a6dda13111fc1f3407d837
parentd9e2db1efd531b5fb0d47a9c03d19f871145a76d
Merge branch 'bug15582_029' into maint-0.2.9