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

[nickm at torproject.org]

commit 77bc95cb5ea7539e51b0c5bc2db8684edcdbd85b
Merge: 55232e3 263f6d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 7 09:52:09 2016 -0800

    Merge remote-tracking branch 'public/17826_redux'

 changes/17826         |    5 +++++
 src/common/include.am |    5 ++++-
 src/or/include.am     |    5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)