[tor-commits] [tor/maint-0.2.8] Merge branch 'bug19903_028_v2' into maint-0.2.8

[nickm at torproject.org]

commit 65cf5130ef60b82bae552363bcca53e5ab9cfd02
Merge: 459e5d7 49843c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 19 19:35:26 2016 -0400

    Merge branch 'bug19903_028_v2' into maint-0.2.8

 changes/bug19903    | 4 ++++
 src/common/tortls.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)