[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug17047'

[nickm at torproject.org]

commit c84f3c917735caf073ee97935687c1ba8ee3639e
Merge: b257e34 902517a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 16 08:46:13 2015 -0400

    Merge remote-tracking branch 'public/bug17047'

 changes/bug17047    |    3 +++
 src/common/tortls.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)