svn merge -r 79680:79822 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-dpo-10.1 --> release

QAR-251 - merge qa-dpo-10 (QAR-166) to release

indra/llmessage/llurlrequest.cpp

@@ -235,7 +235,7 @@ void LLURLRequest::useProxy(bool use_proxy)
     }
 
 
-    lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << env_proxy << llendl;
+    lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (env_proxy ? env_proxy : "(null)") << llendl;
 
     if (env_proxy && use_proxy)
     {