Nick Mathewson 96211bcf71 Merge branch 'bug9321_rerebase' ...

Conflicts:
	src/or/dirvote.h
	src/test/include.am
	src/test/test_entrynodes.c

2015-02-18 09:17:02 -05:00

..

bug9321

Final guardfraction preparations for upstream merge.

2015-02-18 09:09:34 -05:00

bug14918

Fix some issues with reporting exit-free networks

2015-02-17 12:07:24 -05:00

feature13822

Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants

2015-02-07 08:33:23 -05:00