commit db96d1b6b09afd616922723eb88be35f2f4b4fc1 Merge: 802d30d ddfb877 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 14:06:57 2017 -0400
Merge branch 'maint-0.3.0' into release-0.3.0
configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
tor-commits@lists.torproject.org