Commit 09ea0377 authored by juga's avatar juga
Browse files

Merge branch 'bug29149_squashed' 

Solved conflicts:
	docs/source/specification.rst
parents 2a08a7ba 0fb01281

INSTALL.rst

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Continue reading to install ``sbws`` in other ways. 
System requirements

--------------------



- Tor

- Tor (last stable version is recommended)

- Python 3 (>= 3.5)

- virtualenv_ (while there is not ``stem`` release > 1.6.0, it is

  recommended to install the required python dependencies in a virtualenv)

README.md

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ of the Tor bandwidth authorities, to avoid creating unnecessary traffic. 


**ADVICE**: It is recommended to read this documentation at

[Read the Docs](https://sbws.rtfd.io). In

[Github](http://github.com/torproject/sbws) some links won't be properly

[Github](https://github.com/torproject/sbws) some links won't be properly

rendered.

It can also be read after installing the Debian package ``sbws-doc`` in

``/usr/share/doc/sbws`` or after building it locally as explained in

docs/source/activity_all.puml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
@startuml



start



while (no SIGINT/SIGTERM?)



  while (next relay to measure?)



    :Select a destination;



    :Select a second relay;



    :Build a circuit;



    :HTTP GET (Range-Bytes);



    :Store measurement;



  endwhile



endwhile



stop



@enduml
 
 No newline at end of file

docs/source/activity_second_relay.puml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
@startuml



start



if (relay to measure is exit?) then (yes)

  :obtain non-exits;

else (no)

  :obtain an exits

  without bad flag

  that can exit

  to port 443;

endif

:potential second relays;

:obtain a relay

from potential

sencond relays

randomly;

if (second relay has 2x bandwidth?) then (yes)

elseif (other second relay has 1.5x bandwidth?) then (yes)

elseif (other second relay has 1x bandwidth?) then (yes)

else (nothing)

  stop

endif

:second relay selected!;

:Build a circuit

whith exit as

second hop;

stop



@enduml
 
 No newline at end of file

docs/source/bandwidth_authorities.rst

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Bandwidth authorities in metrics

=================================



Current bandwidth authorities

-----------------------------



.. image:: images/bwauth.*

   :alt: bandwidth authorities in metrics



https://metrics.torproject.org/rs.html



(flag:Authority)



Bandwidth Authorities - Measured Relays past 7 days

---------------------------------------------------



.. image:: images/bwauth_measured_7days.png

   :alt: bandwidth measured in the past 7 days



https://consensus-health.torproject.org/graphs.html



Bandwidth Authorities - Measured Relays past 90 days

----------------------------------------------------



.. image:: images/bwauth_measured_90days.png

   :alt: bandwidth measured in the past 90 days



https://consensus-health.torproject.org/graphs.html