Auto merge of #4672 - kennytm:fix-4671, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 29 Oct 2017 16:39:30 +0000 (16:39 +0000)
committerbors <bors@rust-lang.org>
Sun, 29 Oct 2017 16:39:30 +0000 (16:39 +0000)
When uplifting directories, symlink them instead of hard-link them.

Fixes #4671.


Trivial merge