commit a242d194c74b318b8ee4b347efd09ed13d0d2549 Merge: bdd267e 711160a Author: Nick Mathewson <ni...@torproject.org> Date: Tue Jun 27 11:04:44 2017 -0400
Merge branch 'maint-0.2.9' into maint-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@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
