Nick Mathewson 96211bcf71 Merge branch 'bug9321_rerebase' %!s(int64=9) %!d(string=hai) anos
..
bug14918 8eb3d81e6e Fix some issues with reporting exit-free networks %!s(int64=9) %!d(string=hai) anos
bug9321 33053d50a0 Final guardfraction preparations for upstream merge. %!s(int64=9) %!d(string=hai) anos
feature13822 4beb830953 Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants %!s(int64=9) %!d(string=hai) anos