[tor-commits] [tor/master] Merge branch 'bug14334_squashed'

commit 591029253f4b79de0ecd47c464623b0ce13270ef Merge: 7532cd4 d5acb63 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 7 10:59:55 2016 -0400 Merge branch 'bug14334_squashed' changes/bug14334 | 4 ++++ src/or/connection_or.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-)