commit 71f473962f29ac98a41bddcd341c708f8d1451fb
Author: Karsten Loesing <[email protected]>
Date: Thu May 31 12:02:48 2012 +0200
Understand @type annotation in bridge pool assignments.
---
.../torproject/descriptor/impl/DescriptorImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java
b/src/org/torproject/descriptor/impl/DescriptorImpl.java
index a4f1613..00a4b16 100644
--- a/src/org/torproject/descriptor/impl/DescriptorImpl.java
+++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java
@@ -58,7 +58,8 @@ public abstract class DescriptorImpl implements Descriptor {
parsedDescriptors.addAll(ExtraInfoDescriptorImpl.
parseDescriptors(rawDescriptorBytes,
failUnrecognizedDescriptorLines));
- } else if (firstLines.startsWith("bridge-pool-assignment ") ||
+ } else if (firstLines.startsWith("@type bridge-pool-assignment 1.") ||
+ firstLines.startsWith("bridge-pool-assignment ") ||
firstLines.contains("\nbridge-pool-assignment ")) {
parsedDescriptors.addAll(BridgePoolAssignmentImpl.
parseDescriptors(rawDescriptorBytes,
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
