From: bors <bors@rust-lang.org>
Date: Thu, 26 Sep 2013 07:30:57 +0000 (-0700)
Subject: auto merge of #9490 : alexcrichton/rust/issue-9487, r=cmr
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a268a1c4bb3867e4f8b050e07fd216e561b50521;p=rust.git

auto merge of #9490 : alexcrichton/rust/issue-9487, r=cmr

If there's no TLS key just yet, then there's nothing to unsafely borrow, so
continue returning None. This prevents causing the runtime to abort itself when
logging before the runtime is fully initialized.

Closes #9487

r? @brson
---

a268a1c4bb3867e4f8b050e07fd216e561b50521