Avoid variable shadowing in Tor
Tor sure does shadow a lot of local and global variables with its block-level variable declarations.
I spot-checked a few of these and they look harmless.
Still, it would be great if we removed them by renaming the variables in the innermost scope. This would avoid confusion, and remove the possibility of bugs where the declaration is removed, and the identifier references the outer scope.