[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit d890ec29aac33848a3965585965af5f2080206a4
Merge: 3df1d29d9 380ae2b74
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 9 09:35:40 2019 -0500

    Merge branch 'maint-0.3.5'

 changes/bug28895                  |  5 +++++
 src/feature/client/circpathbias.c | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)