[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug18123'

[nickm at torproject.org]

commit 88ad2f5fb215d30d07e2433ee1d9acc7bb19d0ef
Merge: d4c5ccf 8e103cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 28 15:40:35 2016 +0100

    Merge remote-tracking branch 'teor/bug18123'

 changes/bug18123    |  4 ++++
 src/or/connection.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)