commit d3af4f4e43267f79239d116fd2c35e0ca9632f8b Merge: e88686c e3eaee1 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 23 10:45:39 2016 -0500 Merge remote-tracking branch 'arma/bug16825' changes/bug16825 | 7 +++++++ src/or/directory.c | 15 +++++++++------ src/or/main.c | 6 +++--- src/or/main.h | 2 +- 4 files changed, 20 insertions(+), 10 deletions(-)