[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit a36cd51b59f3fbd99041904ac5b963a296aabefb
Merge: 7259e3f f6a776d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 17 11:34:33 2014 +0200

    Merge remote-tracking branch 'origin/maint-0.2.5'

 changes/bug12602    |    5 +++++
 src/common/tortls.c |    2 ++
 2 files changed, 7 insertions(+)