Merge remote-tracking branch 'teor/bug24762'
commit2819e9467e229c2469b6fb0fd584f5cf020ffd3e
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 14:54:56 +0000 (2 09:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 14:54:56 +0000 (2 09:54 -0500)
tree443e7d053fd3efe64155a170bcbb67d196ecc372
parent5051cfe9bd66aa68c6825c00e107f759c921a9ff
parentd99ccf090f5c5cb4ca76524a73c6fd7543fe969e
Merge remote-tracking branch 'teor/bug24762'