Forward-port changelog and release notes for 0.2.5.10
bump version to 0.2.5.10-dev
Merge remote-tracking branch 'origin/maint-0.2.5'
Merge branch 'master' of https://git.torproject.org/tor
Silence spurious clang warnings

Silence clang warnings under --enable-expensive-hardening, including:
  + implicit truncation of 64 bit values to 32 bit;
  + const char assignment to self;
  + tautological compare; and
  + additional parentheses around equality tests. (gcc uses these to
    silence assignment, so clang warns when they're present in an
    equality test. But we need to use extra parentheses in macros to
    isolate them from other code).
Silence spurious clang implicit 64 to 32 bit truncation warnings in trunnel

clang warns that a few implicit casts in trunnel truncate values from
64 to 32 bit. We do explicit casts to silence these warnings.
Merge branch 'silence-warnings'
Add initial copies of generated OS X files, tune warnings
Merge branch 'osxbuild'

Conflicts:
	contrib/osxbuild/tor.xcodeproj/xcshareddata/xcschemes/tor_default.xcscheme
	contrib/osxbuild/tor.xcodeproj/xcshareddata/xcschemes/tor_external_launch.xcscheme
	contrib/osxbuild/tor.xcodeproj/xcshareddata/xcschemes/tor_socks.xcscheme
	contrib/osxbuild/tor.xcodeproj/xcshareddata/xcschemes/tor_tmp.xcscheme