GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 112f7f7d authored by Georg Koppen's avatar Georg Koppen

Merge branch 'maint-1.1' into master

parents b1b3c35c 1adce87c
Pipeline #775 failed with stage
in 35 minutes and 48 seconds
......@@ -30,7 +30,7 @@ class Relay {
int @p average_bandwidth
int @p burst_bandwidth
int @p consensus_bandwidth
int @p consensus_bandwidth_is_unmeasured
bool @p consensus_bandwidth_is_unmeasured
obj _from_ns(attr)
obj _from_desc(attr)
bool can_exit_to_port(int port)
......@@ -217,4 +217,4 @@ class State {
get()
}
@enduml
\ No newline at end of file
@enduml
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -260,6 +260,8 @@ BWLINE_INT_KEYS = (
+ BWLINE_KEYS_V1_2
+ BWLINE_KEYS_V1_4
)
# This is boolean, not int.
BWLINE_INT_KEYS.remove('consensus_bandwidth_is_unmeasured')
def round_sig_dig(n, digits=PROP276_ROUND_DIG):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment