commit 637b4e62d1cd8ebec4092031dc2664c643a3e619 Merge: 911fb93 68a2e4c Author: Roger Dingledine <arma@torproject.org> Date: Mon Jul 28 03:09:12 2014 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug1038-3 | 6 ++++++ changes/bug12227 | 5 +++++ changes/bug12718 | 5 +++++ changes/prop221 | 6 ++++++ doc/tor.1.txt | 8 +++++--- src/common/tortls.c | 5 ++++- src/or/circuitbuild.c | 8 +++++--- src/or/circuituse.c | 9 +++++---- src/or/command.c | 21 +++++++++++++++++---- src/or/config.c | 2 +- src/or/control.c | 2 +- src/or/or.h | 3 +++ 12 files changed, 63 insertions(+), 17 deletions(-)