Bump -version-info
Merge remote-tracking branch 'origin/master'

* origin/master: (24 commits)
  Deallocate on cas failure
  Put gc impl in lib instead of inline
  Uncomment online/offline in gc
  Inline the enqueue func for gc
  Change resize behavior/eliminate retry
  Change the garbage collector queue usage
  Add memory barriers before get/after put
  Fixup the garbage collector.
  Prevent put_if_match from recursing infinitely.
  Compare iterators' indices only when table not NULL
  Collect copied slots only when tombpriming them.
  Use const references instead of copies
  Cleanup thread_state_nodes in gc dtor.
  Allow gc threads to declare themselves offline (opt out of min garbage tracking)
  Fix up race in nwf_hash_table
  A nearly-wait-free hash table.
  An append-only hash map.
  Grab lookup3.c
  Fix the garbage collector from last night.
  A tool for deferring free/delete calls
  ...

Conflicts:
	Makefile.am