Final(?) tweaks to 0.2.6.1-alpha changelog
Bump version to 0.2.6.1-alpha
Fix a typo in the ChangeLog, spotted by Yawning
Clarify 13476 changelog (From sebastian)
Bump version to 0.2.6.1-alpha-dev
New empty changelog section
Twiddle the format_changelog.py option defaults.
Teach format_changelog.py --blog about drupal <!--break-->
Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'
Re-run latest git trunnel to get fix from teor for #13577
Repair format_changelog.py drupal breaks a little more. Drupal is weird.
Refactor {str,digest}map into a common implementation; add digest256map

Needed for #13399.
Merge branch 'digest256map'
Merge branch 'master' of https://git.torproject.org/tor
Stop crashing when a NULL filename is passed to file_status()

Stop crashing when a NULL filename is passed to file_status(),
instead, return FN_ERROR.
Also return FN_ERROR when a zero-length filename is passed to file_status().
Fixed as part of bug 13111.
Stop failing when key files are zero-length

Instead, generate new keys, and overwrite the empty key files.
Adds FN_EMPTY to file_status_t and file_status.
Fixes bug 13111.

Related changes due to review of FN_FILE usage:
Stop generating a fresh .old RSA key file when the .old file is missing.
Avoid overwriting .old key files with empty key files.
Skip loading zero-length extra info store, router store, stats, state,
and key files.
Add changes directory reference to Xcode project
Merge branch 'osxbuild'
Merge branch 'bug13111-empty-key-files-fn-empty'

Conflicts:
	changes/bug13111-generate-keys-on-empty-file
	src/common/util.c
	src/or/router.c
  src/or/routerlist.c

Resolved in favour of bug13111-empty-key-files-fn-empty