"socksport 2000 testingtornetwork 1" results in socksport 9050

If you run Tor client with these two options, it ignores your requested socksport.

This is an important bug because it is preventing our Tor network simulators from running the 0.2.3 branch. (Whee.)