- Result of manual merge of https://ttuki.vtt.fi/svn/p2p-next/TUD/next-share/branches/m48-stb-swift/Nex
t-Share/BaseLib/SwiftEngine r3631-3667.
  i.e., 
   * on-receipt hashchecking configurable
   * bugfix for binmap_t::find_complement
   * no randomization of VOD piece picking via twisting.
  
 Original log messages below:



------------------------------------------------------------------------
r3650 | arno | 2012-03-21 15:58:01 +0100 (Wed, 21 Mar 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/swift.cpp


- Sigh.


------------------------------------------------------------------------
r3649 | arno | 2012-03-21 15:52:33 +0100 (Wed, 21 Mar 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/ext/vod_picker.cpp


- Disable twisting of binmaps when VOD piece picking.


------------------------------------------------------------------------
r3648 | arno | 2012-03-21 15:50:38 +0100 (Wed, 21 Mar 2012) | 11 lines
Changed paths:
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/binmap.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/tests/SConscript
   A /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/tests/binstest3.cpp (from /TUD/next-share/branches/arno-m48-mesh/tests/binstest3.cpp:3647)



- Result of svn merge -x --ignore-eol-style -r 3634:3647 https://ttuki.vtt.fi/svn/p2p-next/TUD/next-sh
are/branches/arno-m48-mesh
  i.e.,

  workaround for binmap_t::find_complement when finding in a range.

  2nd attempt.


------------------------------------------------------------------------
r3636 | arno | 2012-03-19 13:53:27 +0100 (Mon, 19 Mar 2012) | 4 lines
Changed paths:
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/channel.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/cmdgw.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/hashtree.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/hashtree.h
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/httpgw.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/sendrecv.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/swift.cpp
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/swift.h
   M /TUD/next-share/branches/m48-stb-swift/Next-Share/BaseLib/SwiftEngine/transfer.cpp


- Made on-receipt hash checking configurable.





git-svn-id: https://svn.tribler.org/libswift/trunk@25645 001aeff7-3401-0410-a489-f7902fc005dd

- Forgot.



git-svn-id: https://svn.tribler.org/libswift/trunk@25646 001aeff7-3401-0410-a489-f7902fc005dd

- Fix for bug spotted by Riccardo: if no rate limit, hints already asked were not subtracted from new amount to ask.



git-svn-id: https://svn.tribler.org/libswift/trunk@25710 001aeff7-3401-0410-a489-f7902fc005dd

- INT_MAX not defined on my Ubuntu 32-bit?



git-svn-id: https://svn.tribler.org/libswift/trunk@25714 001aeff7-3401-0410-a489-f7902fc005dd
Merge remote-tracking branch 'origin/master' into ietf-demo-server