Update paths

TorCtl is located in a different location if you actually look at the README and the shell script for the submodule. Tor is cloned without the '.git' by default, unless you name it that way, which is confusing. Dependencies have been updated (kinda.)

NetworkScanners/BwAuthority/aggregate.py

@@ -58,7 +58,7 @@ MAX_SCAN_AGE = 60*60*24*1.5
 
 # path to git repos (.git)
 PATH_TO_TORFLOW_REPO = '../../.git/'
-PATH_TO_TORCTL_REPO = '../../TorCtl/.git/'
+PATH_TO_TORCTL_REPO = '../../.git/modules/TorCtl/'
 
 def base10_round(bw_val):
   # This keeps the first 3 decimal digits of the bw value only

NetworkScanners/BwAuthority/bwauthority.py

@@ -15,7 +15,7 @@ STOP_PCT_REACHED = 9
 
 # path to git repos (.git)
 PATH_TO_TORFLOW_REPO = '../../.git/'
-PATH_TO_TORCTL_REPO = '../../TorCtl/.git/'
+PATH_TO_TORCTL_REPO = '../../.git/modules/TorCtl/'
 
 def main(argv):
   (branch, head) = get_git_version(PATH_TO_TORFLOW_REPO)

NetworkScanners/BwAuthority/run_scan.sh

@@ -5,8 +5,8 @@ SCANNER_COUNT=5
 
 # This tor must have the w status line fix as well as the stream bw fix
 # Ie git master or 0.2.2.x
-TOR_EXE=../../../tor.git/src/or/tor
-PYTHONPATH=../../../SQLAlchemy-0.7.3/lib:../../../Elixir-0.7.1/
+TOR_EXE=../../../tor/src/or/tor
+PYTHONPATH=../../../SQLAlchemy-0.7.10/lib:../../../Elixir-0.7.1/
 
 ! [ -e "./local.cfg" ] || . "./local.cfg"