Tribler/tribler — pull request #912 by egbertbouman (2014-11-05 15:18:20+00:00)
Title: Deal with circuit_id collision

Fixes https://github.com/Tribler/tribler/issues/849.