[tor-commits] [tor-launcher/master] Merge remote-tracking branch 'isis/bug18113'

[gk at torproject.org]

commit 8c080d718f722410fcf39adc6da3e05d5b25ce50
Merge: e18194b 8869cf4
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jan 21 13:28:19 2016 +0000

    Merge remote-tracking branch 'isis/bug18113'

 src/modules/tl-util.jsm |   14 ++++++++++++++
 1 file changed, 14 insertions(+)