[tor-commits] [sbws/master] Merge branch 'bug28868'
juga at torproject.org
juga at torproject.org
Fri Feb 15 17:51:28 UTC 2019
commit e23a25abced0b022f452249cf9c3fea97b09f9ed
Merge: f173396 40a94b4
Author: juga0 <juga at riseup.net>
Date: Fri Feb 15 17:50:50 2019 +0000
Merge branch 'bug28868'
Solved conflicts:
sbws/lib/relayprioritizer.py
by applying theirs.
docs/source/specification.rst | 51 +++--------------------
sbws/lib/relayprioritizer.py | 95 +++++++++++++++++++++++++++----------------
2 files changed, 66 insertions(+), 80 deletions(-)
More information about the tor-commits
mailing list