Merge branch 'master' into develop
Add networkstatus flag/weight headers to beginning of file.
Filter UserWarnings generated from cffi while importing nacl.
Fix leekspin versioning.

 * FIXES #12148 https://trac.torproject.org/projects/tor/ticket/12148
Merge branch 'release-0.1.4'