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

[nickm@xxxxxxxxxxxxxx]

commit 48ff8bb49bc1cf3419bc9d62cd3dfd7d7cb12faa
Merge: e23084b a242d19
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 27 11:04:44 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22737       | 12 ++++++++++++
 src/or/connection_or.c |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

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