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

[nickm@xxxxxxxxxxxxxx]

commit 3f55d2efe79524a9f4dd7d7e685aa60056dc2c15
Merge: 54e2a3315 c1ad40627
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 22 09:37:31 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/connection_edge.c | 1 -
 src/test/test_tortls.c   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits