[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.5' into release-0.3.5

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