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

[nickm at torproject.org]

commit 702c0502cf3121e2e698963cf53adb00ae2d136d
Merge: 8676a08 9205552
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 31 14:09:18 2013 -0400

    Merge remote-tracking branch 'public/bug9731'

 changes/bug9731     |    3 +++
 src/or/connection.c |    6 ++++++
 2 files changed, 9 insertions(+)