[tor-commits] [sbws/master] Merge branch 'maint-1.1'
juga at torproject.org
juga at torproject.org
Thu Jul 9 09:49:23 UTC 2020
commit 15fbb2bd3e290f30b18536d0822c703dbca65c4c
Merge: c89a8a3 3e86fd5
Author: juga <juga at riseup.net>
Date: Wed Jul 8 08:23:50 2020 +0000
Merge branch 'maint-1.1'
tests/integration/conftest.py | 6 +-
.../net/auth1/keys/authority_certificate | 65 +++++++++---------
.../net/auth1/keys/authority_identity_key | 78 +++++++++++-----------
.../net/auth1/keys/authority_signing_key | 50 +++++++-------
tests/integration/net/auth1/torrc | 61 +++++++++--------
.../net/auth2/keys/authority_certificate | 65 +++++++++---------
.../net/auth2/keys/authority_identity_key | 78 +++++++++++-----------
.../net/auth2/keys/authority_signing_key | 50 +++++++-------
tests/integration/net/auth2/torrc | 61 +++++++++--------
.../net/auth3/keys/authority_certificate | 65 +++++++++---------
.../net/auth3/keys/authority_identity_key | 78 +++++++++++-----------
.../net/auth3/keys/authority_signing_key | 50 +++++++-------
tests/integration/net/auth3/torrc | 61 +++++++++--------
tests/integration/net/exit1/torrc | 49 +++++++-------
tests/integration/net/exit2/torrc | 49 +++++++-------
tests/integration/net/exit3/torrc | 49 +++++++-------
tests/integration/net/relay1/torrc | 43 ++++++------
tests/integration/net/relay1mbyteMAB/torrc | 44 ++++++------
tests/integration/net/relay1mbyteRBR/torrc | 44 ++++++------
tests/integration/net/relay2/torrc | 43 ++++++------
tests/integration/net/relay3/torrc | 43 ++++++------
tests/integration/net/relay4/torrc | 43 ++++++------
tests/integration/net/relay5/torrc | 43 ++++++------
tests/integration/net/relay6/torrc | 43 ++++++------
tests/integration/net/relay7/torrc | 43 ++++++------
tests/integration/sbws_testnet.ini | 8 +--
26 files changed, 648 insertions(+), 664 deletions(-)
More information about the tor-commits
mailing list