[or-cvs] r20295: {torflow} Update README: the bandwidth voting changes are now in maste (torflow/trunk/NetworkScanners/BwAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-08-14 19:30:47 -0400 (Fri, 14 Aug 2009)
New Revision: 20295

Modified:
   torflow/trunk/NetworkScanners/BwAuthority/README.BwAuthorities
Log:

Update README: the bandwidth voting changes are now in
master.



Modified: torflow/trunk/NetworkScanners/BwAuthority/README.BwAuthorities
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/README.BwAuthorities	2009-08-14 23:28:30 UTC (rev 20294)
+++ torflow/trunk/NetworkScanners/BwAuthority/README.BwAuthorities	2009-08-14 23:30:47 UTC (rev 20295)
@@ -11,44 +11,22 @@
 your authority. You can get it with:
 
      git clone git://git.torproject.org/git/tor.git tor.git
-     cd tor.git
-     git remote add mikeperry git://git.torproject.org/~mikeperry/git/tor
-     git fetch mikeperry
-     git branch --track bandwidth-voting4 mikeperry/bandwidth-voting4
-     git checkout bandwidth-voting4
-     git rebase master
 
 
 1. Find a machine with 10Mbit+ downstream
 
-This can be the same as your directory authority, but if you are 
-handy with rsync, it does not have to be. You will not need the 10Mbit
-continuously, but it should be available on demand, as some of the
-faster nodes actually do have this much slack capacity.
+This can be the same as your directory authority, but it does not have
+to be.  You will not need the 10Mbit continuously, but it should be
+available on demand, as some of the faster nodes actually do have this
+much slack capacity.
 
 The machine will require around 4-5Gbytes/day.
 
 
-2. Get a checkout of Tor with the new network status control fixes:
-
-This checkout will need to be on the machine that does the scanning.
-
-     git clone git://git.torproject.org/git/tor.git tor.git
-     cd tor.git
-     git remote add mikeperry git://git.torproject.org/~mikeperry/git/tor
-     git fetch mikeperry
-     git branch --track rs-format-fix7 mikeperry/rs-format-fix7
-     git checkout rs-format-fix7
-     git rebase master
-
-Note that the rs-format-fix is a child branch of bandwidth-voting, so if
-you only want to have one git codebase for both the scanner and the
-authority, you can just checkout rs-format-fix7.
-
-
 3. Compile Tor for your authority and your scanner
 
-No special configure script options are needed.
+No special configure script options are needed, but again, both
+need to be running the master branch from tor git.
 
 
 4. Download SQLAlchemy 0.5.x-latest and Elixir 0.6.x-latest