[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2

2017-11-13 Thread nickm 
commit 3300a6e93aa9e6adfe9c6bb7949b3774e98b94f8
Merge: cf1e6ad2d 8dff23eb3
Author: Nick Mathewson 
Date:   Mon Nov 13 11:20:20 2017 -0500

Merge remote-tracking branch 'arma/ticket23637' into maint-0.3.2

 changes/ticket23637 |  5 +
 src/or/policies.c   | 13 -
 2 files changed, 9 insertions(+), 9 deletions(-)



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

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket23637'

2017-10-24 Thread nickm 
commit 649000662d3b5f7000c9a4b06444f154e3b0628d
Merge: 350fecfaf 8dff23eb3
Author: Nick Mathewson 
Date:   Tue Oct 24 12:52:41 2017 -0400

Merge remote-tracking branch 'arma/ticket23637'

 changes/ticket23637 |  5 +
 src/or/policies.c   | 13 -
 2 files changed, 9 insertions(+), 9 deletions(-)



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