commit caff66530924f45ce8aacdef0f00002a0b001ccd Merge: d6a3b1f 45f2e7e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 9 10:47:59 2015 -0500 Merge remote-tracking branch 'teor/first-hop-no-private' changes/first-hop-no-private | 8 ++++++++ doc/tor.1.txt | 8 +++++--- src/or/circuitbuild.c | 8 ++++++++ 3 files changed, 21 insertions(+), 3 deletions(-)