Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0
commit412bcc5b2afcc965a6c8e6d09c3bda62df39bcc5
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Apr 2019 15:31:33 +0000 (10 11:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Apr 2019 15:31:33 +0000 (10 11:31 -0400)
tree3d1e5cf91c8f07c7d67a332938db4eef325bf8e2
parent454bdb22eeb4637a8bb5e40deb8454311f4ba4a2
parent2cdc6b2005d2ad09b44cf9a455a70f258e7f6fca
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0