[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug18184'

[nickm at torproject.org]

commit 4dc8dc4b89259e1418cd984abe1cd8d8fc6a7496
Merge: 2123f0a 5f7df92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 10 15:36:48 2016 -0500

    Merge remote-tracking branch 'public/bug18184'

 changes/bug18184     |  5 +++++
 configure.ac         |  4 ++--
 src/common/torint.h  | 28 ++--------------------------
 src/test/test_dir.c  |  2 --
 src/win32/orconfig.h |  3 ---
 5 files changed, 9 insertions(+), 33 deletions(-)