From 4cacb5f35109c02673dcfc42db6721ffed32110f Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 17 Jul 2013 20:23:30 +0000
Subject: [PATCH] merge fix from RC_0_16

---
 include/libtorrent/torrent.hpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index e20a819fa..ccfa9fbbb 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -123,7 +123,10 @@ namespace libtorrent
 #endif
 
 		sha1_hash const& info_hash() const
-		{ return m_torrent_file ? m_torrent_file->info_hash() : sha1_hash(); }
+		{
+			static sha1_hash empty;
+			return m_torrent_file ? m_torrent_file->info_hash() : empty;
+		}
 
 		// starts the announce timer
 		void start();