[tor-commits] [tor/master] Merge branch 'feature9503_squashed'

commit 3a91a08e212ac125215b9aff5ad1ae4102623ab9 Merge: b4ead16 bf67a60 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 25 12:49:09 2014 -0500 Merge branch 'feature9503_squashed' changes/feature9503 | 4 ++++ src/or/control.c | 4 ++++ src/or/main.c | 4 ++++ src/or/or.h | 1 + 4 files changed, 13 insertions(+)