[tor-commits] [bridgedb/develop] Fix documentation for `key` parameter in IPBasedDistributor.

[isis at torproject.org]

commit a43a05802c108292f26c9bc1bc959d5cfb3b62dc
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Apr 14 07:36:28 2015 +0000

    Fix documentation for `key` parameter in IPBasedDistributor.
    
    Conflicts:
    	lib/bridgedb/Dist.py
---
 lib/bridgedb/Dist.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py
index 6bb41b9..78741a7 100644
--- a/lib/bridgedb/Dist.py
+++ b/lib/bridgedb/Dist.py
@@ -156,9 +156,9 @@ class IPBasedDistributor(Distributor):
             because the set of known open proxies constitutes its own
             category.
             DOCDOC What exactly does a cluster *do*?
-        :param bytearray key: The master HMAC key for this distributor. All
-            added bridges are HMACed with this key in order to place them into
-            the hashrings.
+        :param bytes key: The master HMAC key for this distributor. All added
+            bridges are HMACed with this key in order to place them into the
+            hashrings.
         :type ipCategories: iterable or None
         :param ipCategories: DOCDOC
         :type answerParameters: :class:`bridgedb.Bridges.BridgeRingParameters`