[tor-commits] [tor/master] Whitespace, doc fixes

[nickm at torproject.org]

commit db8259c23035a802610ece3dd437cd3ccc32ac9d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 3 16:41:54 2014 -0400

    Whitespace, doc fixes
---
 src/or/config.c          |    3 ++-
 src/or/connection_edge.c |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index e22d3b8..f0ee322 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1089,7 +1089,8 @@ options_act_reversible(const or_options_t *old_options, char **msg)
 
 #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
   /* Open /dev/pf before dropping privileges. */
-  if (options->TransPort_set && options->TransProxyType_parsed == TPT_DEFAULT) {
+  if (options->TransPort_set &&
+      options->TransProxyType_parsed == TPT_DEFAULT) {
     if (get_pf_socket() < 0) {
       *msg = tor_strdup("Unable to open /dev/pf for transparent proxy.");
       goto rollback;
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 04e60b9..f294842 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1391,7 +1391,9 @@ get_pf_socket(void)
 }
 #endif
 
-static int 
+/** Try fill in the address of <b>req</b> from the socket configured
+ * with <b>conn</b>. */
+static int
 destination_from_socket(entry_connection_t *conn, socks_request_t *req)
 {
   struct sockaddr_storage orig_dst;
@@ -1506,7 +1508,6 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req)
   return 0;
 }
 
-
 /** Fetch the original destination address and port from a
  * system-specific interface and put them into a
  * socks_request_t as if they came from a socks request.