[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug7029'

commit 0d946e1773da2a7cf5fa22ff9c62700985b26f7f Merge: 38b7947 3d31771 Author: Nick Mathewson nickm@torproject.org Date: Sun Oct 14 23:06:43 2012 -0400

Merge remote-tracking branch 'arma/bug7029'

changes/bug7029 | 3 +++ src/or/circuitbuild.c | 1 + src/or/config.c | 3 +++ src/or/connection.c | 3 +++ src/or/main.c | 4 ++++ src/or/rephist.c | 2 ++ 6 files changed, 16 insertions(+), 0 deletions(-)