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

[nickm@xxxxxxxxxxxxxx]

commit 4632ad4314e8fa339a5c071e6e6a8a39d70f4bb5
Merge: 409d0cf8d 6443812e3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jul 30 08:45:01 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug26924       | 4 ++++
 src/or/connection_or.c | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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