Merge commit 'mikeperry/bug1740' into maint-0.2.2

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/circuitbuild.h
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/or.h
Simple merge