[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug11069_take2'

commit cce06b649edc51c67bba00c23d0b2b27ad2b892f Merge: b8ceb46 1c475eb Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 11 11:04:47 2014 -0400

Merge remote-tracking branch 'asn/bug11069_take2'

changes/bug11069 | 4 ++++ src/or/connection.c | 25 +++++++++++++++++++++++++ src/or/connection.h | 2 ++ src/or/connection_or.c | 8 +++++--- src/or/control.c | 13 ++++++++----- src/or/control.h | 3 ++- src/or/entrynodes.c | 21 --------------------- src/or/entrynodes.h | 1 - src/test/test_extorport.c | 4 +++- 9 files changed, 49 insertions(+), 32 deletions(-)